Parcourir la source

Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP

57862207 il y a 1 an
Parent
commit
676d4adf99

+ 2 - 0
src/components/TabList/index.vue

@@ -586,7 +586,9 @@ export default {
   },
   mounted() {
     bus.on("benchInfoVisible", (param) => {
+      // console.log('benchInfoVisible', param);
       this.currentBench = param;
+      // console.log('this.currentBench', this.currentBench);
     });
 
     bus.on("benchDisplayLowerVisibleChange", (param) => {

+ 4 - 3
src/views/ordinaryPage/index.vue

@@ -935,7 +935,7 @@ export default {
     
     {
       this.autoPlanResultInterval = setInterval(() => {
-        debugger
+        // debugger
         let autoCurrentTaskData = window.localStorage.getItem("autoCurrentTaskData");
         autoCurrentTaskData = JSON.parse(autoCurrentTaskData);
         if (autoCurrentTaskData) {
@@ -2291,7 +2291,7 @@ export default {
       }
       console.log("benchId", benchId);
       let selectedBench = this.benchList.find((i) => i.benchId == benchId);
-      console.log("selectedBench", selectedBench);
+      // console.log("selectedBench", selectedBench);
       bus.emit("benchInfoVisible", selectedBench);
       this.$nextTick(() => {
         if (benchId == this.currentBench.benchId) {
@@ -2348,7 +2348,8 @@ export default {
             this.currentBench.selected = true;
           }
         }
-        bus.emit("benchInfoVisible", this.currentBench);
+        // console.log('this.currentBench', this.currentBench);
+        // bus.emit("benchInfoVisible", this.currentBench);
       });
     },
     handleBenchClick(benchId, showRemoteButton) {

+ 1 - 0
src/views/squarePage/list.vue

@@ -486,6 +486,7 @@ export default {
             this.currentBench.selected = true;
           }
         }
+        // console.log('this.currentBench', this.currentBench);
         bus.emit("benchInfoVisible", this.currentBench);
       });
     },