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
fe16a102
Commit
fe16a102
authored
Jul 15, 2020
by
张俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
应用仓库tabs显示
parent
deb39c02
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
11 deletions
+30
-11
src/components/image-detail.vue
src/components/image-detail.vue
+3
-2
src/components/table/table-um.vue
src/components/table/table-um.vue
+2
-2
src/pages/workbench/workPlace.vue
src/pages/workbench/workPlace.vue
+19
-5
src/pages/workbench/yygl/app_detail.vue
src/pages/workbench/yygl/app_detail.vue
+5
-1
src/pages/workbench/yygl/yyglList.vue
src/pages/workbench/yygl/yyglList.vue
+1
-1
No files found.
src/components/image-detail.vue
View file @
fe16a102
...
...
@@ -86,7 +86,8 @@ export default {
},
},
methods
:
{
showDialog
(
image
)
{
showDialog
(
image
,
id
)
{
image
.
id
=
id
this
.
image
=
image
;
this
.
imageData
=
[];
this
.
getImageDetail
();
...
...
@@ -152,7 +153,7 @@ export default {
},
getImageDetail
()
{
this
.
$http
.
get
(
`/apaas/hubApi/image/imageDetails/
${
this
.
image
.
name
}
`
)
.
get
(
`/apaas/hubApi/image/imageDetails/
${
this
.
image
.
name
}
?app_id=
${
this
.
image
.
id
}
`
)
.
then
(({
data
})
=>
{
this
.
imageData
=
data
.
data
||
[];
})
...
...
src/components/table/table-um.vue
View file @
fe16a102
...
...
@@ -89,12 +89,12 @@
<b
v-for=
"(btn, key) in item.btnList"
:key=
"key"
:style=
"
{marginRight:item.btngap}">
<em
v-if=
"btn.label == '分配'"
>
<em
v-if=
"btn.label == '分配' &&
scope.row.state == 0
"
v-if=
"btn.label == '分配' &&
!scope.row.use_uid
"
class=
"cur_pointer"
style=
"color: #0f2683"
@
click=
"handleClick(btn.type, scope.row)"
>
分配
</em>
<em
v-if=
"btn.label == '分配' && scope.row.
state == 1
"
>
已分配
</em>
<em
v-if=
"btn.label == '分配' && scope.row.
use_uid
"
>
已分配
</em>
</em>
<em
v-else-if=
"btn.label == '当前版本'"
>
...
...
src/pages/workbench/workPlace.vue
View file @
fe16a102
...
...
@@ -253,6 +253,9 @@
</div>
</div>
<table-um
v-for=
"(itx,idx) in service_head[now_user]"
:key=
"idx+5000"
v-show=
"idx == now_type"
:headers=
"service_head[now_user][now_type]"
:datas=
"service_data"
:stripe=
"true"
...
...
@@ -325,6 +328,10 @@
</div>
</div>
</div>
<allot-info-confirm
ref=
"allotConfirm"
@
allot-success=
"allotSuccess"
></allot-info-confirm>
</div>
</
template
>
...
...
@@ -334,6 +341,7 @@ import tableUm from "@/components/table/table-um";
import
ListPagination
from
"
@/components/comments-pagination
"
;
import
helper
from
"
@/services/helper.js
"
;
import
dashBoard
from
"
../../components/e-charts/dashboard
"
;
import
allotInfoConfirm
from
"
@/components/allot-info-confirm
"
;
import
{
formatDateTime_date
}
from
"
@/utils/common
"
;
import
{
mapGetters
,
mapState
}
from
"
vuex
"
;
import
{
getCookie
}
from
"
../../services/cookie
"
;
...
...
@@ -753,7 +761,7 @@ export default {
{
prop
:
"
sqzt
"
,
label
:
"
操作
"
,
width
:
"
11
0px
"
,
width
:
"
8
0px
"
,
align
:
"
center
"
,
type
:
"
Button
"
,
btnList
:
[
...
...
@@ -761,9 +769,9 @@ export default {
label
:
"
分配
"
,
type
:
"
distribut
"
},
{
label
:
"
已分配
"
}
//
{
//
label: "已分配"
//
}
]
}
]
...
...
@@ -1054,7 +1062,8 @@ export default {
components
:
{
tableUm
,
ListPagination
,
dashBoard
dashBoard
,
allotInfoConfirm
},
computed
:
{
...
mapGetters
([
"
level
"
]),
...
...
@@ -1394,9 +1403,14 @@ export default {
})
.
catch
(
function
(
response
)
{});
},
allotSuccess
()
{
// this.init(this.tempFliter);
this
.
get_service_list
()
},
//分配接口调用
distribut
(
val
)
{
console
.
log
(
val
);
this
.
$refs
.
allotConfirm
.
getDetail
(
val
.
apply_id
);
},
manage_func
(
n
)
{
console
.
log
(
n
);
...
...
src/pages/workbench/yygl/app_detail.vue
View file @
fe16a102
...
...
@@ -292,6 +292,7 @@ export default {
},
created
()
{
console
.
log
(
this
.
$route
);
if
(
this
.
userInfo
){
this
.
now_user
=
this
.
level
this
.
getServiceInfo
();
...
...
@@ -305,6 +306,9 @@ export default {
this
.
get_options
()
this
.
get_file_name
()
this
.
get_app_code
()
if
((
this
.
now_user
==
0
||
this
.
now_user
==
4
)
&&
this
.
$route
.
query
.
source
==
'
apply
'
){
this
.
service_arr
[
0
].
splice
(
1
,
2
);
}
},
mounted
()
{
this
.
header_arr
=
[
...
...
@@ -339,7 +343,7 @@ export default {
},
methods
:
{
showImageDetail
(
item
)
{
this
.
$refs
.
imageDetail
.
showDialog
(
item
);
this
.
$refs
.
imageDetail
.
showDialog
(
item
,
this
.
$route
.
params
.
id
);
},
getCurrentUser
()
{
this
.
$api
.
user
.
getNowUser
().
then
(({
data
})
=>
{
...
...
src/pages/workbench/yygl/yyglList.vue
View file @
fe16a102
...
...
@@ -1268,7 +1268,7 @@ export default {
`
${
this
.
detailsUrl
+
[
item
.
app_id
,
item
.
deploy_id
,
item
.
id
+
"
/
"
+
item
.
app_id
][
this
.
type
]}
`
]}
?source=
${
item
.
source
}
`
);
},
detailItemDeploy
(
item
)
{
...
...
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