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
c8b0847e
Commit
c8b0847e
authored
Aug 03, 2020
by
徐一鸣
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev
parents
8452bf23
50565581
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
104 additions
and
35 deletions
+104
-35
.beagle-arm.yml
.beagle-arm.yml
+3
-3
src/pages/workbench/intelligent_details.vue
src/pages/workbench/intelligent_details.vue
+15
-8
src/pages/workbench/intelligent_drawing.vue
src/pages/workbench/intelligent_drawing.vue
+33
-8
src/pages/workbench/yygl/deploy_app_detail.vue
src/pages/workbench/yygl/deploy_app_detail.vue
+41
-16
src/store/index.js
src/store/index.js
+12
-0
No files found.
.beagle-arm.yml
View file @
c8b0847e
...
@@ -31,7 +31,7 @@ pipeline:
...
@@ -31,7 +31,7 @@ pipeline:
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes
:
volumes
:
-
/var/run/docker.sock:/var/run/docker.sock
-
/var/run/docker.sock:/var/run/docker.sock
base
:
registry.cn-qingdao.aliyuncs.com/wod-
k8s/node-arm64:14.5.0-buster-slim
base
:
registry.cn-qingdao.aliyuncs.com/wod-
devops/ui-base-arm64:2.0
repo
:
wod/apaas-ui-arm64
repo
:
wod/apaas-ui-arm64
version
:
"
v3.0.0"
version
:
"
v3.0.0"
channel
:
alpha
channel
:
alpha
...
@@ -47,7 +47,7 @@ pipeline:
...
@@ -47,7 +47,7 @@ pipeline:
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes
:
volumes
:
-
/var/run/docker.sock:/var/run/docker.sock
-
/var/run/docker.sock:/var/run/docker.sock
base
:
registry.cn-qingdao.aliyuncs.com/wod-
k8s/node-arm64:14.5.0-buster-slim
base
:
registry.cn-qingdao.aliyuncs.com/wod-
devops/ui-base-arm64:2.0
repo
:
wod/apaas-ui-arm64
repo
:
wod/apaas-ui-arm64
version
:
"
v3.0.0"
version
:
"
v3.0.0"
registry
:
registry.cn-qingdao.aliyuncs.com
registry
:
registry.cn-qingdao.aliyuncs.com
...
@@ -62,7 +62,7 @@ pipeline:
...
@@ -62,7 +62,7 @@ pipeline:
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
image
:
registry.cn-qingdao.aliyuncs.com/wod/devops-docker-arm64:1.0
volumes
:
volumes
:
-
/var/run/docker.sock:/var/run/docker.sock
-
/var/run/docker.sock:/var/run/docker.sock
base
:
registry.cn-qingdao.aliyuncs.com/wod-
k8s/node-arm64:14.5.0-buster-slim
base
:
registry.cn-qingdao.aliyuncs.com/wod-
devops/ui-base-arm64:2.0
repo
:
wod/apaas-ui-arm64
repo
:
wod/apaas-ui-arm64
version
:
"
v3.0"
version
:
"
v3.0"
registry
:
registry.cn-qingdao.aliyuncs.com
registry
:
registry.cn-qingdao.aliyuncs.com
...
...
src/pages/workbench/intelligent_details.vue
View file @
c8b0847e
...
@@ -18,26 +18,33 @@
...
@@ -18,26 +18,33 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
originUrl
:
'
https://apaasgis.wodcloud.com/portal/apaasplat/viewer/item.html
'
originUrl
:
'
https://apaasgis.wodcloud.com/portal/apaasplat/viewer/item.html
'
,
};
};
},
},
computed
:{
computed
:{
itemUrl
:
function
(){
itemUrl
(){
let
_self
=
this
;
let
_self
=
this
;
if
(
_self
.
$route
.
name
==
'
intelligent_details
'
){
if
(
_self
.
$route
.
name
==
'
intelligent_details
'
){
return
`
${
_self
.
originUrl
}
?id=
${
_self
.
$route
.
query
.
id
}
&activeMenu=
${
_self
.
$route
.
query
.
type
}
`
return
`
${
_self
.
originUrl
}
?id=
${
_self
.
$route
.
query
.
id
}
&activeMenu=
${
_self
.
$route
.
query
.
activeMenu
}
`
}
}
}
}
},
},
mounted
()
{
mounted
()
{
this
.
$nextTick
(()
=>
{
window
.
addEventListener
(
'
message
'
,
event
=>
{
window
.
addEventListener
(
'
message
'
,
event
=>
{
let
data
=
event
.
data
;
let
data
=
event
.
data
;
if
(
data
.
cmd
==
'
mapmsg
'
){
if
(
data
.
cmd
==
'
mapdetailtoview
'
){
console
.
log
(
data
);
console
.
log
(
data
);
this
.
$store
.
commit
(
"
setZnztDetailsParams
"
,
data
.
params
);
this
.
$router
.
push
(
'
/intelligent_drawing
'
)
}
}
})
})
})
},
},
methods
:
{},
methods
:
{},
destroyed
()
{
// window.removeEventListener('message')
}
};
};
</
script
>
</
script
>
...
...
src/pages/workbench/intelligent_drawing.vue
View file @
c8b0847e
...
@@ -14,34 +14,38 @@
...
@@ -14,34 +14,38 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
mapState
}
from
"
vuex
"
;
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
url
:
'
https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html
'
,
url
:
'
https://apaasgis.wodcloud.com/portal/apaasplat/viewer/mapViewer.html
'
,
queryType
:
''
,
id
:
''
,
};
};
},
},
computed
:{
computed
:{
...
mapState
([
'
znztDetailsParams
'
]),
getZnztParams
()
{
getZnztParams
()
{
return
this
.
$store
.
state
.
znztParams
;
return
this
.
$store
.
state
.
znztParams
;
},
},
znztUrl
(){
znztUrl
(){
return
this
.
url
+
this
.
urlParams
if
(
this
.
queryType
==
'
webmap
'
){
},
return
this
.
url
+
`?webmap=
${
this
.
id
}
`
;
urlParams
(){
}
else
if
(
this
.
queryType
==
'
layers
'
){
if
(
this
.
$store
.
state
.
znztParams
){
return
this
.
url
+
`?layers=
${
this
.
id
}
`
;
return
`?webmap=
${
this
.
$store
.
state
.
znztParams
.
id
}
`
;
}
else
{
}
else
{
return
this
.
url
return
''
}
}
},
},
},
},
watch
:
{
watch
:
{
getZnztParams
(
newVal
)
{
getZnztParams
(
newVal
)
{
this
.
urlParams
=
`?webmap=
${
newVal
.
id
}
`
console
.
log
(
'
智能制图参数
'
+
newVal
)
console
.
log
(
'
智能制图参数
'
+
newVal
)
},
},
},
},
mounted
()
{
mounted
()
{
this
.
id
=
this
.
znztDetailsParams
.
id
;
this
.
queryType
=
this
.
znztDetailsParams
.
queryType
;
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
window
.
addEventListener
(
'
message
'
,
event
=>
{
window
.
addEventListener
(
'
message
'
,
event
=>
{
let
data
=
event
.
data
;
let
data
=
event
.
data
;
...
@@ -77,6 +81,27 @@ export default {
...
@@ -77,6 +81,27 @@ export default {
});
});
window
.
open
(
routeData
.
href
,
'
_blank
'
);
window
.
open
(
routeData
.
href
,
'
_blank
'
);
}
}
// 智能制图页面跳转
if
(
data
.
cmd
==
'
mapviewurl
'
){
console
.
log
(
data
);
switch
(
data
.
params
.
queryType
)
{
case
'
webmap
'
:
this
.
queryType
=
'
webmap
'
;
this
.
$store
.
commit
(
"
setZnztIdParams
"
,
data
.
params
.
id
);
this
.
id
=
data
.
params
.
id
;
break
;
case
'
layers
'
:
this
.
queryType
=
'
layers
'
;
this
.
$store
.
commit
(
"
setZnztIdParams
"
,
data
.
params
.
id
);
this
.
id
=
data
.
params
.
id
;
break
;
default
:
this
.
queryType
=
''
;
this
.
$store
.
commit
(
"
setZnztIdParams
"
,
''
);
this
.
id
=
''
;
break
;
}
}
})
})
})
})
},
},
...
...
src/pages/workbench/yygl/deploy_app_detail.vue
View file @
c8b0847e
...
@@ -172,7 +172,16 @@
...
@@ -172,7 +172,16 @@
</nor-card>
</nor-card>
<nor-card
title=
"服务设置"
flag=
"true"
v-show=
"is_current_user"
>
<nor-card
title=
"服务设置"
flag=
"true"
v-show=
"is_current_user"
>
<div
class=
"addimage"
>
多版本回滚
</div>
<div
class=
"addimage"
>
<el-select
v-model=
"mesh_value"
placeholder=
"请选择"
>
<el-option
v-for=
"item in mesh_options"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
>
</el-option>
</el-select>
</div>
<p
class=
"imagebox"
>
<p
class=
"imagebox"
>
<span
<span
@
click=
"image_select = index;getImageInfo()"
@
click=
"image_select = index;getImageInfo()"
...
@@ -191,7 +200,7 @@
...
@@ -191,7 +200,7 @@
:key=
"index+7000"
:key=
"index+7000"
v-show=
"image_select == index"
v-show=
"image_select == index"
stripe
stripe
height=
"3
00
"
height=
"3
76
"
style=
"width: 100%"
>
style=
"width: 100%"
>
<el-table-column
<el-table-column
prop=
"tag"
prop=
"tag"
...
@@ -301,6 +310,21 @@ export default {
...
@@ -301,6 +310,21 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
mesh_value
:
0
,
mesh_options
:[
{
value
:
0
,
label
:
'
多版本回滚
'
},
{
value
:
1
,
label
:
'
AB测试
'
},
{
value
:
2
,
label
:
'
权重管理
'
},
],
now_user
:
0
,
//0:普通用户,1:组织管理员,2:超级管理员
now_user
:
0
,
//0:普通用户,1:组织管理员,2:超级管理员
buy_style
:
0
,
buy_style
:
0
,
image_select
:
0
,
image_select
:
0
,
...
@@ -1008,6 +1032,17 @@ background-color:cyan;
...
@@ -1008,6 +1032,17 @@ background-color:cyan;
background
:
khaki
;
background
:
khaki
;
}
}
.addimage
.el-input__inner
{
width
:
110px
;
height
:
28px
;
line-height
:
28px
;
font-size
:
12px
;
color
:
#707693
;
}
.addimage
.el-input__icon
{
line-height
:
28px
;
}
</
style
>
</
style
>
<
style
scoped
>
<
style
scoped
>
.info_contain
>>>
.apass_dialog
.el-dialog__footer
{
.info_contain
>>>
.apass_dialog
.el-dialog__footer
{
...
@@ -1087,19 +1122,9 @@ background:khaki;
...
@@ -1087,19 +1122,9 @@ background:khaki;
color
:
#58617a
;
color
:
#58617a
;
}
}
.addimage
{
.addimage
{
display
:
inline-block
;
position
:
absolute
;
color
:
#f8f9fd
;
right
:
20px
;
font-size
:
16px
;
top
:
-36px
;
width
:
124px
;
height
:
44px
;
line-height
:
44px
;
text-align
:
center
;
background-color
:
#0f2683
;
border-radius
:
8px
;
margin-top
:
20px
;
margin-bottom
:
30px
;
margin-left
:
40px
;
cursor
:
pointer
;
}
}
.use_know
p
{
.use_know
p
{
height
:
44px
;
height
:
44px
;
...
@@ -1187,12 +1212,12 @@ background:khaki;
...
@@ -1187,12 +1212,12 @@ background:khaki;
color
:
#58617a
;
color
:
#58617a
;
}
}
.imagebox
{
.imagebox
{
padding-top
:
20px
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
padding-left
:
40px
;
padding-left
:
40px
;
}
}
.imagebox
span
{
.imagebox
span
{
width
:
165px
;
height
:
34px
;
height
:
34px
;
padding
:
0
10px
;
padding
:
0
10px
;
line-height
:
34px
;
line-height
:
34px
;
...
...
src/store/index.js
View file @
c8b0847e
...
@@ -21,6 +21,12 @@ const store = new Vuex.Store({
...
@@ -21,6 +21,12 @@ const store = new Vuex.Store({
menuCartState
:
0
,
//购物车操作都要修改这个值,menu监听这个值的变化实时获取购物车列表
menuCartState
:
0
,
//购物车操作都要修改这个值,menu监听这个值的变化实时获取购物车列表
znztParams
:
null
,
//智能制图传入过来的数据
znztParams
:
null
,
//智能制图传入过来的数据
appBuilderParams
:
null
,
//应用程序传入过来的数据
appBuilderParams
:
null
,
//应用程序传入过来的数据
znztIdParams
:
''
,
//智能制图服务id
znztDetailsParams
:
{
type
:
''
,
queryType
:
''
,
id
:
''
,
},
//智能制图服务详情id
},
},
getters
:
{
getters
:
{
// 1:超管 2:组织管理员 3:普通用户 4:开发者
// 1:超管 2:组织管理员 3:普通用户 4:开发者
...
@@ -60,6 +66,12 @@ const store = new Vuex.Store({
...
@@ -60,6 +66,12 @@ const store = new Vuex.Store({
setAppBuilderParams
(
state
,
newValue
)
{
setAppBuilderParams
(
state
,
newValue
)
{
state
.
appBuilderParams
=
newValue
;
state
.
appBuilderParams
=
newValue
;
},
},
setZnztIdParams
(
state
,
newValue
)
{
state
.
znztIdParams
=
newValue
;
},
setZnztDetailsParams
(
state
,
newValue
)
{
state
.
znztDetailsParams
=
newValue
;
},
},
},
});
});
...
...
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