mn

src/store/modules/bench/actions.js

@@ -29,6 +29,9 @@ export default {
   setBenchImgList({commit}, data) {
     commit('setBenchImgList',data)
   },
+  removeBenchImgList({commit}, data) {
+    commit('removeBenchImgList',data)
+  },
   filterBenchList({commit}, data) {
     commit('filterBenchList', data)
   }

src/store/modules/bench/mutations.js

@@ -4,14 +4,14 @@ export default {
       bench.groups = JSON.parse(bench.groups)
       let basicInfo = bench.groups["Basic Information"]
       let benchInfo = bench.groups["Bench Information"]
-      for(let key in basicInfo) {
+      for (let key in basicInfo) {
         bench[key] = basicInfo[key]
       }
-      for(let key in benchInfo) {
+      for (let key in benchInfo) {
         bench[key] = benchInfo[key]
       }
-      bench.left = Math.random() * 90 + (i*(Math.random() * 10 + 10)) + 300;
-      bench.top = Math.random() * 80 + (i*(Math.random() * 10 + 10)) + 200;
+      bench.left = Math.random() * 90 + (i * (Math.random() * 10 + 10)) + 300;
+      bench.top = Math.random() * 80 + (i * (Math.random() * 10 + 10)) + 200;
 
       bench.status = "ready";
       bench.name = "";
@@ -96,18 +96,28 @@ export default {
 
   },
   setBenchImgList(state, data) {
-    if(!state.benchImgList.some(b => b.alt == data.benchId)) {
+    if (!state.benchImgList.some(b => b.alt == data.benchId)) {
       state.benchImgList.push({
         alt: data.benchId,
-        url: "data:image/jpeg;base64,"+data.img
+        url: "data:image/jpeg;base64," + data.img
       })
     }
   },
+  removeBenchImgList(state, data) {
+    console.log('data------------------', data);
+    console.log('state.benchImgList-1', state.benchImgList);
+    let newBenchImgList = state.benchImgList.filter((item) => {
+      return item.alt != data.benchId;
+    })
+    console.log('newBenchImgList', JSON.parse(JSON.stringify(newBenchImgList)));
+    state.benchImgList = newBenchImgList;
+    console.log('state.benchImgList-2', state.benchImgList);
+  },
   filterBenchList(state, list) {
 
     state.filterBenchList = state.benchList.slice();
     list.forEach(data => {
-      switch(data.type) {
+      switch (data.type) {
         case 'status':
           state.filterBenchList = state.filterBenchList.filter(s => s.status == data.value);
           break;
@@ -128,12 +138,12 @@ export default {
           break;
       }
     })
-    
+
   },
   setTaskList(state, taskList) {
     taskList.forEach((task) => {
       task.groups = JSON.parse(task.groups)
-      console.log('groups',task.groups);
+      console.log('groups', task.groups);
       //let basicInfo = bench.groups["Basic Information"]
       //let benchInfo = bench.groups["Bench Information"]
       //for(let key in basicInfo) {
@@ -144,7 +154,7 @@ export default {
       //}
       //bench.left = Math.random() * 90;
       //bench.top = Math.random() * 80;
-//
+      //
       //bench.status = "ready";
       //bench.name = "";
       //bench.type = 1;

src/views/originPage/list.vue

@@ -476,8 +476,17 @@ export default {
           let href = window.location.href;
           if (href.indexOf("benchid=") != -1) {
             let benchid = href.substring(href.indexOf("benchid=") + 8);
+            let remoteBenchList = JSON.parse(
+              window.localStorage.getItem("remoteBenchList")
+            );
             console.log("benchid", benchid);
-            this.selectBench(parseInt(benchid));
+            console.log(
+              "item == benchId",
+              remoteBenchList.find((item) => item == benchid)
+            );
+            if (remoteBenchList.find((item) => item == benchid)) {
+              this.selectBench(parseInt(benchid));
+            }
           }
         }, 200);
         return;
@@ -581,8 +590,9 @@ export default {
             </div>`;
     },
     handleImageClick(index) {
-      console.log("点击了图片，索引为：", index);
-      this.selectBench(parseInt(this.images[index].alt));
+      this.selectBench(
+        parseInt(this.images[index + 5 * (this.currentPage - 1)].alt)
+      );
     },
     prevPage() {
       if (this.currentPage > 1) {
@@ -1519,6 +1529,21 @@ export default {
     disconnectBench() {
       ws.disconnectBench({ bench_id: String(this.connetedBenchId) }).then(
         (res) => {
+          var remoteBenchList = JSON.parse(
+            window.localStorage.getItem("remoteBenchList")
+          );
+          let newRemoteBenchList = remoteBenchList.filter((item) => {
+            return item != this.connetedBenchId;
+          });
+          window.localStorage.setItem(
+            "remoteBenchList",
+            JSON.stringify(newRemoteBenchList)
+          );
+          this.$store.dispatch("benchList/removeBenchImgList", {
+            benchId: this.connetedBenchId,
+          });
+          this.getImgList(newRemoteBenchList);
+
           this.connetedBenchId = "";
           this.currentBench = {};
           this.benchDisplayVisible = false;
@@ -1535,6 +1560,7 @@ export default {
       });
     },
     benchList(newValue, oldValue) {
+      console.log("newValue", newValue);
       var strRemoteBenchList = window.localStorage.getItem("remoteBenchList");
       var objRBL = JSON.parse(strRemoteBenchList);
       console.log("zmg1", objRBL);