Jelajahi Sumber

fix bug: window.open 改为 路由跳转

yx 4 tahun lalu
induk
melakukan
487bab2263
2 mengubah file dengan 20 tambahan dan 19 penghapusan
  1. 4 4
      src/components/baseEditer.vue
  2. 16 15
      src/views/drafts.vue

+ 4 - 4
src/components/baseEditer.vue

@@ -633,16 +633,16 @@ export default {
             type: "success"
           });
           setTimeout(() => {
-            const token = this.$store.getters["token"];
+            /* const token = this.$store.getters["token"];
             const data = `categoryId=${this.urlMsg.categoryId}&projectId=${this.urlMsg.projectId}&BuildingID=${this.urlMsg.BuildingID}&FloorID=${this.urlMsg.FloorID}&fmapID=${this.urlMsg.fmapID}&token=${token}`;
             const url =
               window.location.origin +
               "/wandaEditer/drafts?" +
               encodeURIComponent(data);
-            window.open(url, true);
+            window.open(url, true); */
             // // 发布成功跳转草稿箱
-            // const token = this.$store.getters["token"];
-            // this.$router.push({ path: 'drafts', query: { projectId:this.urlMsg.projectId,BuildingID:this.urlMsg.BuildingID,fmapID:this.urlMsg.fmapID,token:token}})
+            const token = this.$store.getters["token"];
+            this.$router.push({ path: 'drafts', query: { projectId:this.urlMsg.projectId,BuildingID:this.urlMsg.BuildingID,fmapID:this.urlMsg.fmapID,token:token}})
           }, 2000);
         } else {
           Message({

+ 16 - 15
src/views/drafts.vue

@@ -450,27 +450,28 @@ export default {
      */
     goToEditer() {
       setTimeout(() => {
-        const token = this.$store.getters["token"];
+        /* const token = this.$store.getters["token"];
         const data = `categoryId=${this.categoryId}&projectId=${this.projectId}&BuildingID=1&FloorID=${this.floorId}&FloorName=${this.floorName}&fmapID=${this.fmapID}&token=${token}`;
         const url =
           window.location.origin +
           "/wandaEditer/editer?" +
           encodeURIComponent(data);
-        window.open(url, true);
+        window.open(url, true); */
+         
         // 发布成功跳转草稿箱
-        // const token = this.$store.getters["token"];
-        // this.$router.push({
-        //   path: "editer",
-        //   query: {
-        //     categoryId: this.categoryId,
-        //     projectId: this.projectId,
-        //     BuildingID: 1,
-        //     FloorName: this.floorName,
-        //     FloorID: this.floorId,
-        //     fmapID: this.fmapID,
-        //     token:token
-        //   }
-        // });
+        const token = this.$store.getters["token"];
+        this.$router.push({
+          path: "editer",
+          query: {
+            categoryId: this.categoryId,
+            projectId: this.projectId,
+            BuildingID: 1,
+            FloorName: this.floorName,
+            FloorID: this.floorId,
+            fmapID: this.fmapID,
+            token:token
+          }
+        });
       }, 1000);
     },
     // 切换草稿箱楼层