修改bug

src/views/ordinaryPage/index.less

@@ -131,16 +131,19 @@
         }
         .item-tag {
           display: flex;
-          margin-top: 2vh;
+          margin-top: 0vh;
+          width: 10vw;
           .tag {
-            width: 3.13vw;
-            height: 2.96vh;
-            line-height: 2.96vh;
+            margin-bottom: 0.2vh;
+            //width: 3.13vw;
+            height: 1.96vh;
+            font-size: xx-small;
+            line-height: 1.96vh;
             text-align: center;
             background-color: #5d9a6d;
             border-radius: 10px;
             color: #f2f2f2;
-            margin-right: 1vw;
+            margin-right: 0.2vw;
           }
         }
       }

src/views/ordinaryPage/index.vue

@@ -51,6 +51,48 @@
                           @click="bmMapItemSelect(key)"
                           @mouseover="bmMapItemSelect(key)"
                           @mouseleave="bmMapItemUnSelect()"
+                        >
+                          <Transition v-if="false">
+                            <template>
+                              <div
+                                class="bmMapItemInfo"
+                                :class="{
+                                  bmMapItemInfoSelected: item.selected,
+                                }"
+                              >
+                                <span>
+                                  {{ item.name }}
+                                </span>
+                                <span style="display: flex; align-items: center">
+                                  {{ item.Project }}
+                                </span>
+                                <div style="width: 100%">
+                                  <span
+                                    class="bmInfoMsSlideNameStatus"
+                                    :class="{
+                                      ['bmInfoMsSlideNameStatus ' + item.status]: true,
+                                    }"
+                                  ></span>
+                                </div>
+                                <!-- <div class="bmMapItemInfoAfter"></div> -->
+                              </div>
+                            </template>
+                          </Transition>
+                        </div>
+
+                        <div
+                          v-for="(item, key) in benchList"
+                          :key="key"
+                          class="bmMapItem"
+                          :style="{
+                            left: item.left - 23 + 'px',
+                            top: item.top - 140 + 'px',
+                            scale: item.scale,
+                          }"
+                          :class="item.status"
+                          @click="bmMapItemSelect(key)"
+                          @mouseover="bmMapItemSelect(key)"
+                          @mouseleave="bmMapItemUnSelect()"
                         >
                           <Transition v-if="item.selected">
                             <template>
@@ -79,6 +121,8 @@
                             </template>
                           </Transition>
                         </div>
+
+
                       </div>
                     </div>
                   </Transition>
@@ -441,6 +485,18 @@
                     //{
                     //  element.style = "{background: rgba(0, 0, 0, 1)}"
                     //});
+                    if(benchId == this.currentBench.id && this.currentBench.selected == true)
+                    {
+                      this.currentBench.selected = false;
+                      this.currentBench.scale = 1;
+                      this.currentBench = {};
+                      let items = document.getElementsByClassName('item-box');
+                      for(var index = 0; index<items.length;index++)
+                      {
+                        items[index].style.background = "#00000032"
+                      }
+                      return;
+                    }
                     let items = document.getElementsByClassName('item-box');
                     for(var index = 0; index<items.length;index++)
                     {
@@ -526,10 +582,19 @@
                         <div class="item-title">${item.id}
                           <span onClick="selectBench(${item.id})" class="el-icon-s-platform ${item.status}"></span>
                         </div>
+                        <div class="item-description">Automation Lab-7E</div>
                         <div class="item-description">${item.name}</div>
                         <div class="item-tag">
-                            <div class="tag">${item.Cluster}</div>
                             <div class="tag">${item.Market}</div>
+                            <div class="tag">${item.Platform}</div>
+                            <div class="tag">${item.Project}</div>
+                            <div class="tag">${item.Carline}</div>
+                            <div class="tag">${item.Cluster}</div>
+                        </div>
+                        <div class="item-tag">
+                            <div class="tag">${item.MU_SW}</div>
+                            <div class="tag">${item.Variant}</div>
+                            <div class="tag">${item.ip}</div>
                         </div>
                     </div>
                 </div>

src/views/originPage/index.less

@@ -124,16 +124,19 @@
       }
       .item-tag {
         display: flex;
-        margin-top: 0.92vh;
+        margin-top: 0vh;
+        width: 10vw;
         .tag {
-          width: 3.13vw;
-          height: 2.96vh;
-          line-height: 2.96vh;
+          margin-bottom: 0.2vh;
+          //width: 3.13vw;
+          height: 1.96vh;
+          font-size: xx-small;
+          line-height: 1.96vh;
           text-align: center;
           background-color: #5d9a6d;
           border-radius: 10px;
           color: #f2f2f2;
-          margin-right: 1vw;
+          margin-right: 0.2vw;
         }
       }
     }

src/views/originPage/list.vue

@@ -402,18 +402,74 @@ export default {
       }
     });
 
-    setTimeout(() => {
-      let href = window.location.href;
-              if(href.indexOf('benchid=')!=-1)
-              {
-                let benchid = href.substring(href.indexOf('benchid=')+8);
-                console.log('benchid',benchid);
-                selectBench(parseInt(benchid))
-              }
-            }, 3000);
+    let self = this;
+    var strRemoteBenchList = window.localStorage.getItem('remoteBenchList');
+    var objRBL = JSON.parse(strRemoteBenchList);
+    console.log('zmg1',objRBL);
+    var objRBLReverse = [];
+    for(;objRBL.length>0;)
+    {
+      objRBLReverse.push(objRBL.pop());
+    }    
+    if (objRBLReverse.length>0) {
+      setTimeout(()=>{
+        this.getImgList(objRBLReverse);
+      },300)
+    }
   },
 
+
   methods: {
+    getImgList(objRBL)
+    {
+      console.log('zmg3',objRBL)
+      let benchId = objRBL.pop();
+      if (benchId == null)
+      {
+        console.log('zmg2')
+        setTimeout(() => {
+          let href = window.location.href;
+          if(href.indexOf('benchid=')!=-1)
+          {
+            let benchid = href.substring(href.indexOf('benchid=')+8);
+            console.log('benchid',benchid);
+            this.selectBench(parseInt(benchid))
+          }
+        }, 200);
+        return;
+      }
+      let self = this;
+      
+      console.log('benchId',benchId)
+      ws.connectBench({ bench_id: String(benchId) })
+      .then((res) => {
+        ws.getImage(String(benchId), 1).then((res) => {
+          
+          self.$store.dispatch('benchList/setBenchImgList', {benchId, img: res.data.data});
+          self.getImgList(objRBL);
+          //// let screen = screenType == 1 ? "upper" : "lower";
+          //if (screenType == 1) {
+          //  self.benchImgUpper = "data:image/png;base64," + res.data.data;
+          //} else {
+          //  self.benchImgLower = "data:image/png;base64," + res.data.data;
+          //}
+          // let screen = res.data.screen_type;
+          //if (benchId == this.connetedBenchId) {
+          //  self.getBenchImage(benchId, screenType, func);
+          //  this.$store.dispatch('benchList/setBenchImgList', {benchId, img: res.data.data});
+          //}
+        });
+      })
+      .catch((err) => {
+          console.log('connect bench failed',benchId);
+          self.$message({
+            message: "This bench is offline",
+            // message: "",
+            type: "warning",
+          });
+        });
+        
+    },
     rowClassName () {
         return ''
     },
@@ -447,10 +503,19 @@ export default {
                             <span onClick="selectBench(${item.id})" class="el-icon-s-platform ${item.status}"></span>
                         </div>
                         <div class="item-text">
+                          <div class="item-description">Automation Lab-7E</div>
                             <div class="item-description">${item.name}</div>
                             <div class="item-tag">
-                                <div class="tag">${item.Cluster}</div>
                                 <div class="tag">${item.Market}</div>
+                                <div class="tag">${item.Platform}</div>
+                                <div class="tag">${item.Project}</div>
+                                <div class="tag">${item.Carline}</div>
+                                <div class="tag">${item.Cluster}</div>
+                            </div>
+                            <div class="item-tag">
+                                <div class="tag">${item.MU_SW}</div>
+                                <div class="tag">${item.Variant}</div>
+                                <div class="tag">${item.ip}</div>
                             </div>
                         </div>
                     </div>
@@ -460,6 +525,7 @@ export default {
     },
     handleImageClick(index) {
       console.log("点击了图片，索引为：", index);
+      this.selectBench(parseInt(this.images[index].alt))
     },
     prevPage() {
       if (this.currentPage > 1) {

src/views/squarePage/index.less

@@ -97,16 +97,19 @@
         }
         .item-tag {
           display: flex;
-          margin-top: 2vh;
+          margin-top: 0vh;
+          width: 10vw;
           .tag {
-            width: 3.13vw;
-            height: 2.96vh;
-            line-height: 2.96vh;
+            margin-bottom: 0.2vh;
+            //width: 3.13vw;
+            height: 1.96vh;
+            font-size: xx-small;
+            line-height: 1.96vh;
             text-align: center;
             background-color: #5d9a6d;
             border-radius: 10px;
             color: #f2f2f2;
-            margin-right: 1vw;
+            margin-right: 0.2vw;
           }
         }
       }

src/views/squarePage/list.vue

@@ -9,17 +9,16 @@
             />
             <div class="square-map">
                 <el-row>
-                    <el-col v-for="item in images" :key="item" :span="8">
-                      <div style="background-color: black; padding-top: 30px; padding-bottom: 30px;  padding-left: 5px;  padding-right: 5px; margin: 10px; border-radius: 20px;">
-                          
-                          <div class="grid-item">
-                            <img :src="item.url" @click="handleClickImg(item.alt)" />
+                    <el-col v-for="(item, index) in images" :key="item" :span="8">
+                      <div class="grid-item-background" style="background-color: black; padding-top: 30px; padding-bottom: 30px;  padding-left: 5px;  padding-right: 5px; margin: 10px; border-radius: 20px;"> 
+                        <div class="grid-item">
+                            <img :src="item.url" @dblclick="handleDblClickImg(item.alt)" @click="handleClickImg(item.alt,index)"/>
                           </div>
                           <div class="grid-item-close">
                             <img width="30px" src="../../images/closeremotebench.png" @click="handleCloseImg(item.alt)"/>
                           </div>
                       </div>
-
+                      
                     </el-col>
                 </el-row>
             </div>
@@ -61,6 +60,7 @@
         components: {StatusBar, TabList, SearchBar},
         data() {
             return {
+              currentBenchId: 0,
                 inputValue: '',
                 isOpen: false,
                 gridItems: [1, 2, 3, 4, 5, 6, 7, 8, 9],
@@ -158,6 +158,7 @@
             });
             window.handleListClick = this.handleListClick;
             window.handleListDbClick = this.handleListDbClick;
+            window.handleDblClickImg = this.handleDblClickImg;
             window.handleClickImg = this.handleClickImg;
             window.selectBench = this.selectBench.bind(this);
             let that = this;
@@ -325,10 +326,19 @@
                         <div class="item-title">${item.id}
                           <span onClick="selectBench(${item.id})" class="el-icon-s-platform ${item.status}"></span>
                         </div>
+                        <div class="item-description">Automation Lab-7E</div>
                         <div class="item-description">${item.name}</div>
                         <div class="item-tag">
-                            <div class="tag">${item.Cluster}</div>
                             <div class="tag">${item.Market}</div>
+                            <div class="tag">${item.Platform}</div>
+                            <div class="tag">${item.Project}</div>
+                            <div class="tag">${item.Carline}</div>
+                            <div class="tag">${item.Cluster}</div>
+                        </div>
+                        <div class="item-tag">
+                            <div class="tag">${item.MU_SW}</div>
+                            <div class="tag">${item.Variant}</div>
+                            <div class="tag">${item.ip}</div>
                         </div>
                     </div>
                 </div>
@@ -367,9 +377,39 @@
                 });
               }, 500);
             },
-            handleClickImg(benchId) {
+            handleDblClickImg(benchId) {
               window.location.href = '/originPage?m=8b934420_ZJUb_b6f9&benchid='+benchId;
             },
+            handleClickImg(benchId,indexParam) {
+              this.$nextTick(() => {
+                    //this.$refs.benchdetail.init(benchId);
+                    //this.benchList.forEach(element => 
+                    //{
+                    //  element.style = "{background: rgba(0, 0, 0, 1)}"
+                    //});
+                    if(benchId == this.currentBenchId)
+                    {
+                      benchId = 0;
+                      let items = document.getElementsByClassName('grid-item-background');
+                      for(var index = 0; index<items.length;index++)
+                      {
+                        items[index].style.background = "#000000"
+                      }
+                      return;
+                    }
+                    this.currentBenchId = benchId;
+                    let items = document.getElementsByClassName('grid-item-background');
+                    for(var index = 0; index<items.length;index++)
+                    {
+                      items[index].style.background = "#000000";
+                      if(index == indexParam)
+                      {
+                        console.log('equal');
+                        items[index].style.background = "#ffffff"
+                      }
+                    }
+                });
+            },
             handleCloseImg(benchId) {
               var strRemoteBenchList = window.localStorage.getItem('remoteBenchList');
               var objRBL = JSON.parse(strRemoteBenchList);