Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

src/pages/workbench/fwzc_fwcs.vue

@@ -1039,6 +1039,7 @@ export default {
     },
     listeners(event) {
       console.log(event);
+      let self = this;
       if (event && event.origin == "https://apaasgis.wodcloud.com" && event.data) {
         if (event.data.cmd == "getPortalItemInfo") {
           console.log(event.data.params);
@@ -1084,7 +1085,7 @@ export default {
   },
   mounted() {
     let self = this;
-    window.addEventListener("message", self.listeners(), false);
+    window.addEventListener("message", self.listeners, false);
     self.judgeMap();
     self.getArea();
   },

src/pages/workbench/intelligent_drawing.vue

@@ -47,67 +47,69 @@ export default {
     this.id = this.znztDetailsParams.id;
     this.queryType = this.znztDetailsParams.queryType;
     this.$nextTick(() => {
-      window.addEventListener('message',event =>{
-        let data = event.data;
-        // 智能制图发布服务
-        if (data.cmd == 'mapviewmsg'){
-          console.log(data);
-          this.$store.commit("setZnztParams", data.params);
-          this.$router.push(`/fwzc/fwcs?map=1`);
-        }
-        // App Builder页面 -- 新窗口打开
-        if (data.cmd == 'mapviewtoapp'){
-          console.log(data);
-          let params = {
-            title: data.params.title,
-            tags: data.params.tags,
-            sharewithwebmap:data.params.shareWithWebMap,
-            webmap:data.params.id,
-            summary: data.params.summary,
-          };
-          let routeData = this.$router.resolve({
-            name: "intelligent_appbuilder",
-            query: params,
-          });
-          window.open(routeData.href, '_blank');
-          // this.$store.commit("setAppBuilderParams", data.params);
-        }
-        // 智能制图服务详情--新窗口打开
-        if (data.cmd == 'mapdetailmsg'){
-          console.log(data);
-          let routeData = this.$router.resolve({
-            name: "intelligent_details",
-            query: data.params,
-          });
-          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;
-          }
-        }
-      })
+      window.addEventListener('message',this.postmassageevt);
     })
   },
-  methods: {},
+  methods: {
+    postmassageevt(event){
+      let data = event.data;
+      // 智能制图发布服务
+      if (data.cmd == 'mapviewmsg'){
+        console.log(data);
+        this.$store.commit("setZnztParams", data.params);
+        this.$router.push(`/fwzc/fwcs?map=1`);
+      }
+      // App Builder页面 -- 新窗口打开
+      if (data.cmd == 'mapviewtoapp'){
+        console.log(data);
+        let params = {
+          title: data.params.title,
+          tags: data.params.tags,
+          sharewithwebmap:data.params.shareWithWebMap,
+          webmap:data.params.id,
+          summary: data.params.summary,
+        };
+        let routeData = this.$router.resolve({
+          name: "intelligent_appbuilder",
+          query: params,
+        });
+        window.open(routeData.href, '_blank');
+        // this.$store.commit("setAppBuilderParams", data.params);
+      }
+      // 智能制图服务详情--新窗口打开
+      if (data.cmd == 'mapdetailmsg'){
+        console.log(data);
+        let routeData = this.$router.resolve({
+          name: "intelligent_details",
+          query: data.params,
+        });
+        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;
+        }
+      }
+    }
+  },
   destroyed () {
-    window.removeEventListener('message')
+    window.removeEventListener('message',this.postmassageevt);
   } 
 };
 </script>