From 2a1a44d9c8e1a18e13561eb52fc1c6330b912dbc Mon Sep 17 00:00:00 2001 From: zhangyang Date: Thu, 29 Jul 2021 15:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E7=A9=BA=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=B3=A8=E5=86=8C=EF=BC=88=E5=A2=9E=E5=8A=A0=E4=B8=89?= =?UTF-8?q?=E7=BB=B4=E5=9C=B0=E5=9B=BE=E6=B3=A8=E5=86=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 2 ++ src/pages/workbench/fwzc_fwcs.vue | 28 +++++++++++++++++++- src/store/index.js | 44 ++++++++++++++++++++++--------- static/config/configmap.js | 2 +- 4 files changed, 61 insertions(+), 15 deletions(-) diff --git a/config/index.js b/config/index.js index 3b1177d..f5fef64 100644 --- a/config/index.js +++ b/config/index.js @@ -11,8 +11,10 @@ module.exports = { assetsPublicPath: "/apaas/ui/", proxyTable: { "/apaas": { + //target: "https://apaas.cztest.local/apaas/", target: "https://apaas3.wodcloud.com/apaas/", changeOrigin: true, + secure: false,//关键在设置这个值为false pathRewrite: { "^/apaas": "" } diff --git a/src/pages/workbench/fwzc_fwcs.vue b/src/pages/workbench/fwzc_fwcs.vue index b1d90eb..a5f9a01 100644 --- a/src/pages/workbench/fwzc_fwcs.vue +++ b/src/pages/workbench/fwzc_fwcs.vue @@ -1091,6 +1091,7 @@ export default { requestRules: 0, responseRules: 0, is_map: 0, + mapBackText: "返回智能制图", process_id: "", param_fields: [], body_fields: [], @@ -1470,7 +1471,7 @@ export default { if (this.cover.length != 0) { this.mapR = true; let query = {}; - if (this.is_map == 1) { + if (this.is_map == 1 || this.is_map == 5) { query = { name: this.form.name, sectors: this.form.area, @@ -1840,6 +1841,7 @@ export default { self.is_map = self.$route.query.map; self.jcxxtx = true; if (self.$store.state.znztParams) { + self.mapBackText = "返回智能制图"; let data = this.$store.state.znztParams; self.form.name = data.name; self.form.desc = data.descript; @@ -1849,7 +1851,19 @@ export default { self.cover[0] = data.cover; self.portal_id = data.portalid; 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) { + self.mapBackText = "返回Web应用程序"; let data = this.$store.state.appBuilderParams; self.form.name = data.name; self.form.desc = data.descript; @@ -1888,6 +1902,12 @@ export default { "/vmap/#/map" + `?id=${shareWebMapParam.portalid}`; } else if (self.is_map == 4) { 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 { let shareWebMapParam = JSON.parse( window.sessionStorage.getItem("shareWebMapParam") @@ -2212,6 +2232,12 @@ export default { if (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( sessionStorage.getItem("shareAppBuilderParam") ); diff --git a/src/store/index.js b/src/store/index.js index 2522fed..caa30e2 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -21,6 +21,7 @@ const store = new Vuex.Store({ menuCartState: 0, //购物车操作都要修改这个值，menu监听这个值的变化实时获取购物车列表 cartState: 0, znztParams: null, //智能制图传入过来的数据 + cesiumMapParams: null, //三维制图传入过来的数据 appBuilderParams: null, //应用程序传入过来的数据 znztIdParams: '', //智能制图服务id znztDetailsParams: { @@ -32,11 +33,13 @@ const store = new Vuex.Store({ }, getters: { // 1：超管 2：组织管理员 3：普通用户 4：开发者 - is_admin: (state) => { + is_admin: (state) => + { return (state.userInfo && state.userInfo.is_admin) || 3; }, // 0：普通用户，1：组织管理员，2：超级管理员 - level: (state, getters) => { + level: (state, getters) => + { if (getters.is_admin == 1) { return 2; } else if (getters.is_admin == 2) { @@ -47,37 +50,52 @@ const store = new Vuex.Store({ }, }, mutations: { - userInfofun(state, newValue) { + userInfofun (state, newValue) + { state.userInfo = newValue; }, - rolefun(state, newValue) { + rolefun (state, newValue) + { state.role = newValue; }, - serviceShopMenuAct(state, newValue) { + serviceShopMenuAct (state, newValue) + { state.serviceShopMenu = newValue; }, - setShoppingCart(state, newValue) { + setShoppingCart (state, newValue) + { state.shoppingCart = newValue; }, - setMenuCartState(state) { + setMenuCartState (state) + { state.menuCartState++; }, - setCartState(state) { + setCartState (state) + { state.cartState++; }, - setZnztParams(state, newValue) { + setZnztParams (state, newValue) + { state.znztParams = newValue; }, - setAppBuilderParams(state, newValue) { + setCesiumMapParams (state, newValue) + { + state.cesiumMapParams = newValue; + }, + setAppBuilderParams (state, newValue) + { state.appBuilderParams = newValue; }, - setZnztIdParams(state, newValue) { + setZnztIdParams (state, newValue) + { state.znztIdParams = newValue; }, - setZnztDetailsParams(state, newValue) { + setZnztDetailsParams (state, newValue) + { state.znztDetailsParams = newValue; }, - setUnreadMessageCount(state, newValue) { + setUnreadMessageCount (state, newValue) + { state.unreadMessageCount = newValue; }, }, diff --git a/static/config/configmap.js b/static/config/configmap.js index 9cf3657..d25f385 100644 --- a/static/config/configmap.js +++ b/static/config/configmap.js @@ -1,5 +1,5 @@ window.serviceConfig = { gisServiceRoot: 'https://apaasgis.wodcloud.com', - state: "needLogin", // needLogin / notNeedLogin + state: "notNeedLogin", // needLogin / notNeedLogin cloudServiceRoot: 'https://cloud4.wodcloud.com/awecloud/login/#/', }; \ No newline at end of file -- 2.26.0