deepsea 1 year ago
parent
commit
207c231989
1 changed files with 8 additions and 14 deletions
  1. 8 14
      src/views/ordinaryPage/index.vue

+ 8 - 14
src/views/ordinaryPage/index.vue

@@ -977,7 +977,6 @@ export default {
     bus.on("goHome", () => {
       this.isConnected = false;
       this.$store.dispatch("common/setSquareStatus", false);
-<<<<<<< HEAD
     })
 
     let autoCurrentTaskData = localStorage.get("autoCurrentTaskData");
@@ -992,9 +991,6 @@ export default {
       autoTaskStatus.value = "running";
       autoTaskStep.value = 3;
     }
-=======
-    });
->>>>>>> 6503e943e53996a6be919d4c3e4e5efb649cbdc4
   },
   methods: {
     turnToNextManualCase() {},
@@ -1357,20 +1353,18 @@ export default {
                   <div class="item-image"><img src="${item.image}" alt="${item.title}"></div>
                   <div class="item-right">
                       <div class="item-text">
-                          <div class="item-title">${item.id}
+                          <div class="item-title">${item.name}
                             <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.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 class="tag">${item.MU_SW}</div>
-                              <div class="tag">${item.Variant}</div>
-                              <div class="tag">${item.ip}</div>
+                              <div class="tag" title="Market">${item.Market}</div>
+                              <div class="tag" title="Platform">${item.Platform}</div>
+                              <div class="tag" title="Project">${item.Project}</div>
+                              <div class="tag" title="Carline">${item.Carline}</div>
+                              <div class="tag" title="Cluster">${item.Cluster}</div>
+                              <div class="tag" title="MU_SW">${item.MU_SW}</div>
+                              <div class="tag" title="Variant">${item.Variant}</div>
                           </div>
                       </div>
                   </div>