Merge branch 'zh' into dev

config/index.js

@@ -24,6 +24,13 @@ module.exports = {
           "^/awecloud": ""
         }
       },
+      "/vmap": {
+        target: "https://apaas3.wodcloud.com/vmap/",
+        changeOrigin: true,
+        pathRewrite: {
+          "^/vmap": ""
+        }
+      },
     },
     // Various Dev Server settings
     host: "localhost", // can be overwritten by process.env.HOST

src/pages/workbench/fwzc_fwcs.vue

@@ -1587,12 +1587,14 @@ export default {
     goBack(type) {
       let self = this;
       if (type == "map") {
-        self.$store.commit("setZnztDetailsParams", {
-          type: "",
-          queryType: "webmap",
-          id: self.portal_id,
-        });
-        this.$router.push("/intelligent_drawing");
+        // self.$store.commit("setZnztDetailsParams", {
+        //   type: "",
+        //   queryType: "webmap",
+        //   id: self.portal_id,
+        // });
+        // this.$router.push("/intelligent_drawing");
+        let shareWebMapParam =JSON.parse(window.sessionStorage.getItem('shareWebMapParam'))
+        window.location.href = '/vmap/#/map'+`?id=${shareWebMapParam.portalid}`
       } else if (type == "process") {
         this.$router.push("/progress/designer");
       }

src/pages/workbench/workPlace.vue

@@ -972,8 +972,8 @@ export default {
           pic: require("@/assets/imgs/home_tool_ic_znht.png"),
           bg: "#e5f4fe",
           color: "#38aef9",
-          url: "/intelligent_drawing",
-          target: 0
+          url: "/vmap/#/map",
+          target: 1
         },
         {
           text: "流程设计",