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
2a1a44d9
Commit
2a1a44d9
authored
Jul 29, 2021
by
张洋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改时空服务注册(增加三维地图注册)
parent
4fbce66b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
15 deletions
+61
-15
config/index.js
config/index.js
+2
-0
src/pages/workbench/fwzc_fwcs.vue
src/pages/workbench/fwzc_fwcs.vue
+27
-1
src/store/index.js
src/store/index.js
+31
-13
static/config/configmap.js
static/config/configmap.js
+1
-1
No files found.
config/index.js
View file @
2a1a44d9
...
@@ -11,8 +11,10 @@ module.exports = {
...
@@ -11,8 +11,10 @@ module.exports = {
assetsPublicPath
:
"
/apaas/ui/
"
,
assetsPublicPath
:
"
/apaas/ui/
"
,
proxyTable
:
{
proxyTable
:
{
"
/apaas
"
:
{
"
/apaas
"
:
{
//target: "https://apaas.cztest.local/apaas/",
target
:
"
https://apaas3.wodcloud.com/apaas/
"
,
target
:
"
https://apaas3.wodcloud.com/apaas/
"
,
changeOrigin
:
true
,
changeOrigin
:
true
,
secure
:
false
,
//关键在设置这个值为false
pathRewrite
:
{
pathRewrite
:
{
"
^/apaas
"
:
""
"
^/apaas
"
:
""
}
}
...
...
src/pages/workbench/fwzc_fwcs.vue
View file @
2a1a44d9
...
@@ -1091,6 +1091,7 @@ export default {
...
@@ -1091,6 +1091,7 @@ export default {
requestRules
:
0
,
requestRules
:
0
,
responseRules
:
0
,
responseRules
:
0
,
is_map
:
0
,
is_map
:
0
,
mapBackText
:
"
返回智能制图
"
,
process_id
:
""
,
process_id
:
""
,
param_fields
:
[],
param_fields
:
[],
body_fields
:
[],
body_fields
:
[],
...
@@ -1470,7 +1471,7 @@ export default {
...
@@ -1470,7 +1471,7 @@ export default {
if
(
this
.
cover
.
length
!=
0
)
{
if
(
this
.
cover
.
length
!=
0
)
{
this
.
mapR
=
true
;
this
.
mapR
=
true
;
let
query
=
{};
let
query
=
{};
if
(
this
.
is_map
==
1
)
{
if
(
this
.
is_map
==
1
||
this
.
is_map
==
5
)
{
query
=
{
query
=
{
name
:
this
.
form
.
name
,
name
:
this
.
form
.
name
,
sectors
:
this
.
form
.
area
,
sectors
:
this
.
form
.
area
,
...
@@ -1840,6 +1841,7 @@ export default {
...
@@ -1840,6 +1841,7 @@ export default {
self
.
is_map
=
self
.
$route
.
query
.
map
;
self
.
is_map
=
self
.
$route
.
query
.
map
;
self
.
jcxxtx
=
true
;
self
.
jcxxtx
=
true
;
if
(
self
.
$store
.
state
.
znztParams
)
{
if
(
self
.
$store
.
state
.
znztParams
)
{
self
.
mapBackText
=
"
返回智能制图
"
;
let
data
=
this
.
$store
.
state
.
znztParams
;
let
data
=
this
.
$store
.
state
.
znztParams
;
self
.
form
.
name
=
data
.
name
;
self
.
form
.
name
=
data
.
name
;
self
.
form
.
desc
=
data
.
descript
;
self
.
form
.
desc
=
data
.
descript
;
...
@@ -1849,7 +1851,19 @@ export default {
...
@@ -1849,7 +1851,19 @@ export default {
self
.
cover
[
0
]
=
data
.
cover
;
self
.
cover
[
0
]
=
data
.
cover
;
self
.
portal_id
=
data
.
portalid
;
self
.
portal_id
=
data
.
portalid
;
self
.
is_portal
=
true
;
self
.
is_portal
=
true
;
}
else
if
(
self
.
$store
.
state
.
cesiumMapParams
)
{
self
.
mapBackText
=
"
返回三维制图
"
;
let
data
=
this
.
$store
.
state
.
cesiumMapParams
;
self
.
form
.
name
=
data
.
name
;
self
.
form
.
desc
=
data
.
descript
;
self
.
form
.
area
=
Number
(
data
.
sectors
);
self
.
serviceUrl
=
data
.
url
;
self
.
skfwQqt
=
Number
(
data
.
data_service_type2
);
self
.
cover
[
0
]
=
data
.
cover
;
self
.
portal_id
=
data
.
portalid
;
self
.
is_portal
=
true
;
}
else
if
(
self
.
$store
.
state
.
appBuilderParams
)
{
}
else
if
(
self
.
$store
.
state
.
appBuilderParams
)
{
self
.
mapBackText
=
"
返回Web应用程序
"
;
let
data
=
this
.
$store
.
state
.
appBuilderParams
;
let
data
=
this
.
$store
.
state
.
appBuilderParams
;
self
.
form
.
name
=
data
.
name
;
self
.
form
.
name
=
data
.
name
;
self
.
form
.
desc
=
data
.
descript
;
self
.
form
.
desc
=
data
.
descript
;
...
@@ -1888,6 +1902,12 @@ export default {
...
@@ -1888,6 +1902,12 @@ export default {
"
/vmap/#/map
"
+
`?id=
${
shareWebMapParam
.
portalid
}
`
;
"
/vmap/#/map
"
+
`?id=
${
shareWebMapParam
.
portalid
}
`
;
}
else
if
(
self
.
is_map
==
4
)
{
}
else
if
(
self
.
is_map
==
4
)
{
self
.
$router
.
back
(
-
1
);
self
.
$router
.
back
(
-
1
);
}
else
if
(
self
.
is_map
==
5
)
{
let
shareCesiumMapParam
=
JSON
.
parse
(
window
.
sessionStorage
.
getItem
(
"
shareCesiumMapParam
"
)
);
window
.
location
.
href
=
"
/cesiummap/#/map
"
+
`?id=
${
shareCesiumMapParam
.
portalid
}
`
;
}
else
{
}
else
{
let
shareWebMapParam
=
JSON
.
parse
(
let
shareWebMapParam
=
JSON
.
parse
(
window
.
sessionStorage
.
getItem
(
"
shareWebMapParam
"
)
window
.
sessionStorage
.
getItem
(
"
shareWebMapParam
"
)
...
@@ -2212,6 +2232,12 @@ export default {
...
@@ -2212,6 +2232,12 @@ export default {
if
(
webmap_data
)
{
if
(
webmap_data
)
{
_self
.
$store
.
commit
(
"
setZnztParams
"
,
webmap_data
);
_self
.
$store
.
commit
(
"
setZnztParams
"
,
webmap_data
);
}
}
let
cesiummap_data
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"
shareCesiumMapParam
"
)
);
if
(
cesiummap_data
)
{
_self
.
$store
.
commit
(
"
setCesiumMapParams
"
,
cesiummap_data
);
}
let
appmap_data
=
JSON
.
parse
(
let
appmap_data
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"
shareAppBuilderParam
"
)
sessionStorage
.
getItem
(
"
shareAppBuilderParam
"
)
);
);
...
...
src/store/index.js
View file @
2a1a44d9
...
@@ -21,6 +21,7 @@ const store = new Vuex.Store({
...
@@ -21,6 +21,7 @@ const store = new Vuex.Store({
menuCartState
:
0
,
//购物车操作都要修改这个值,menu监听这个值的变化实时获取购物车列表
menuCartState
:
0
,
//购物车操作都要修改这个值,menu监听这个值的变化实时获取购物车列表
cartState
:
0
,
cartState
:
0
,
znztParams
:
null
,
//智能制图传入过来的数据
znztParams
:
null
,
//智能制图传入过来的数据
cesiumMapParams
:
null
,
//三维制图传入过来的数据
appBuilderParams
:
null
,
//应用程序传入过来的数据
appBuilderParams
:
null
,
//应用程序传入过来的数据
znztIdParams
:
''
,
//智能制图服务id
znztIdParams
:
''
,
//智能制图服务id
znztDetailsParams
:
{
znztDetailsParams
:
{
...
@@ -32,11 +33,13 @@ const store = new Vuex.Store({
...
@@ -32,11 +33,13 @@ const store = new Vuex.Store({
},
},
getters
:
{
getters
:
{
// 1:超管 2:组织管理员 3:普通用户 4:开发者
// 1:超管 2:组织管理员 3:普通用户 4:开发者
is_admin
:
(
state
)
=>
{
is_admin
:
(
state
)
=>
{
return
(
state
.
userInfo
&&
state
.
userInfo
.
is_admin
)
||
3
;
return
(
state
.
userInfo
&&
state
.
userInfo
.
is_admin
)
||
3
;
},
},
// 0:普通用户,1:组织管理员,2:超级管理员
// 0:普通用户,1:组织管理员,2:超级管理员
level
:
(
state
,
getters
)
=>
{
level
:
(
state
,
getters
)
=>
{
if
(
getters
.
is_admin
==
1
)
{
if
(
getters
.
is_admin
==
1
)
{
return
2
;
return
2
;
}
else
if
(
getters
.
is_admin
==
2
)
{
}
else
if
(
getters
.
is_admin
==
2
)
{
...
@@ -47,37 +50,52 @@ const store = new Vuex.Store({
...
@@ -47,37 +50,52 @@ const store = new Vuex.Store({
},
},
},
},
mutations
:
{
mutations
:
{
userInfofun
(
state
,
newValue
)
{
userInfofun
(
state
,
newValue
)
{
state
.
userInfo
=
newValue
;
state
.
userInfo
=
newValue
;
},
},
rolefun
(
state
,
newValue
)
{
rolefun
(
state
,
newValue
)
{
state
.
role
=
newValue
;
state
.
role
=
newValue
;
},
},
serviceShopMenuAct
(
state
,
newValue
)
{
serviceShopMenuAct
(
state
,
newValue
)
{
state
.
serviceShopMenu
=
newValue
;
state
.
serviceShopMenu
=
newValue
;
},
},
setShoppingCart
(
state
,
newValue
)
{
setShoppingCart
(
state
,
newValue
)
{
state
.
shoppingCart
=
newValue
;
state
.
shoppingCart
=
newValue
;
},
},
setMenuCartState
(
state
)
{
setMenuCartState
(
state
)
{
state
.
menuCartState
++
;
state
.
menuCartState
++
;
},
},
setCartState
(
state
)
{
setCartState
(
state
)
{
state
.
cartState
++
;
state
.
cartState
++
;
},
},
setZnztParams
(
state
,
newValue
)
{
setZnztParams
(
state
,
newValue
)
{
state
.
znztParams
=
newValue
;
state
.
znztParams
=
newValue
;
},
},
setAppBuilderParams
(
state
,
newValue
)
{
setCesiumMapParams
(
state
,
newValue
)
{
state
.
cesiumMapParams
=
newValue
;
},
setAppBuilderParams
(
state
,
newValue
)
{
state
.
appBuilderParams
=
newValue
;
state
.
appBuilderParams
=
newValue
;
},
},
setZnztIdParams
(
state
,
newValue
)
{
setZnztIdParams
(
state
,
newValue
)
{
state
.
znztIdParams
=
newValue
;
state
.
znztIdParams
=
newValue
;
},
},
setZnztDetailsParams
(
state
,
newValue
)
{
setZnztDetailsParams
(
state
,
newValue
)
{
state
.
znztDetailsParams
=
newValue
;
state
.
znztDetailsParams
=
newValue
;
},
},
setUnreadMessageCount
(
state
,
newValue
)
{
setUnreadMessageCount
(
state
,
newValue
)
{
state
.
unreadMessageCount
=
newValue
;
state
.
unreadMessageCount
=
newValue
;
},
},
},
},
...
...
static/config/configmap.js
View file @
2a1a44d9
window
.
serviceConfig
=
{
window
.
serviceConfig
=
{
gisServiceRoot
:
'
https://apaasgis.wodcloud.com
'
,
gisServiceRoot
:
'
https://apaasgis.wodcloud.com
'
,
state
:
"
needLogin
"
,
// needLogin / notNeedLogin
state
:
"
n
otN
eedLogin
"
,
// needLogin / notNeedLogin
cloudServiceRoot
:
'
https://cloud4.wodcloud.com/awecloud/login/#/
'
,
cloudServiceRoot
:
'
https://cloud4.wodcloud.com/awecloud/login/#/
'
,
};
};
\ No newline at end of file
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