Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
900be442
Commit
900be442
authored
Jun 10, 2020
by
徐一鸣
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'xym' into dev
parents
fcd35b80
b5b45013
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
571 additions
and
479 deletions
+571
-479
src/components/app-list/app-card.vue
src/components/app-list/app-card.vue
+4
-4
src/components/app-list/app-list.vue
src/components/app-list/app-list.vue
+2
-2
src/pages/workbench/fwgl/fwglList.vue
src/pages/workbench/fwgl/fwglList.vue
+24
-20
src/pages/workbench/yygl/yyglList.vue
src/pages/workbench/yygl/yyglList.vue
+540
-452
src/store/index.js
src/store/index.js
+1
-1
No files found.
src/components/app-list/app-card.vue
View file @
900be442
...
...
@@ -4,12 +4,12 @@
<i
class=
"el-icon-close"
></i>
</a>
<div
class=
"app_card-icon"
>
<el-avatar
shape=
"square"
:size=
"56"
fit=
"cover"
:src=
"data.
img
"
/>
<el-avatar
shape=
"square"
:size=
"56"
fit=
"cover"
:src=
"data.
logo
"
/>
</div>
<div
class=
"app_card-info"
>
<p
class=
"app_card-name text_clip"
v-text=
"data.name"
v-text=
"data.
app_
name"
@
click=
"intoDetail"
></p>
<p
class=
"app_card-version text_clip"
v-text=
"data.version"
></p>
...
...
@@ -24,7 +24,7 @@
<i
class=
"el-icon-time"
></i>
<span>
上线时间:
</span>
</span>
<span
class=
"text_clip"
v-text=
"data.
time
"
></span>
<span
class=
"text_clip"
v-text=
"data.
created
"
></span>
</p>
</div>
</
template
>
...
...
@@ -53,7 +53,7 @@ export default {
this
.
$emit
(
"
delete-action
"
,
this
.
data
);
},
intoDetail
()
{
this
.
$router
.
push
(
`
${
this
.
detailsUrl
}${
this
.
data
.
id
}
`
);
this
.
$router
.
push
(
`
${
this
.
detailsUrl
}${
this
.
data
.
up_user
id
}
`
);
},
},
};
...
...
src/components/app-list/app-list.vue
View file @
900be442
...
...
@@ -60,12 +60,12 @@ export default {
<
style
scoped
>
.app_list
{
margin
:
20px
-25px
0
;
margin
:
0
-20px
;
padding
:
30px
0
0
;
border-top
:
1px
solid
#e3e5ef
;
display
:
flex
;
flex-wrap
:
wrap
;
justify-content
:
flex-start
;
align-items
:
flex-start
;
align-content
:
flex-start
;
}
</
style
>
src/pages/workbench/fwgl/fwglList.vue
View file @
900be442
...
...
@@ -39,7 +39,7 @@ export default {
listHeader
:
[],
listData
:
[],
filterList
:
[],
role
Filter
:
[],
other
Filter
:
[],
dialogInfo
:
{
title
:
""
,
msg
:
""
,
...
...
@@ -73,7 +73,8 @@ export default {
Promise
.
all
([
this
.
$http
.
get
(
"
/apaas/service/v3/service/manager/servtype
"
),
this
.
$http
.
get
(
"
/apaas/service/v3/service/manager/servarea
"
),
]).
then
((
response
)
=>
{
])
.
then
((
response
)
=>
{
let
data
=
response
.
map
((
item
)
=>
{
return
{
name
:
item
.
body
.
data
[
0
].
type_name
,
...
...
@@ -85,7 +86,10 @@ export default {
};
});
this
.
filterList
=
[...
data
,
...
this
.
roleFilter
];
this
.
filterList
=
[...
data
,
...
this
.
otherFilter
];
})
.
catch
((
error
)
=>
{
console
.
log
(
error
);
});
},
initHeader
()
{
...
...
@@ -163,7 +167,7 @@ export default {
],
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
@@ -267,7 +271,7 @@ export default {
],
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
@@ -419,7 +423,7 @@ export default {
align
:
"
center
"
,
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
@@ -532,7 +536,7 @@ export default {
],
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
@@ -696,7 +700,7 @@ export default {
],
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
@@ -795,7 +799,7 @@ export default {
],
},
];
this
.
role
Filter
=
[
this
.
other
Filter
=
[
{
name
:
"
开放程度
"
,
prop
:
"
openness
"
,
...
...
src/pages/workbench/yygl/yyglList.vue
View file @
900be442
This diff is collapsed.
Click to expand it.
src/store/index.js
View file @
900be442
...
...
@@ -12,7 +12,7 @@ const store = new Vuex.Store({
[
"
平台服务管理
"
,
"
服务审批管理
"
/* , "云资源管理" */
],
// 超级管理员
],
// 服务管理列表,onlyRead
yyglNav
:
[
[
"
应用仓库
"
,
"
我部署的应用
"
,
"
申请的应用
"
,
"
审批的应用
"
],
// 普通用户
[
"
应用仓库
"
,
"
我部署的应用
"
,
"
申请的应用
"
/* "审批的应用" */
],
// 普通用户
[
"
应用仓库管理
"
,
"
部署的应用
"
,
"
应用审批管理
"
],
// 组织管理员
[
"
平台应用管理
"
,
"
应用部署管理
"
,
"
应用审批管理
"
],
// 超级管理员
],
// 应用管理列表,onlyRead
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment