合并九宫格代码

src/components/TabList/index.vue

@@ -1180,7 +1180,7 @@ export default {
 .origin-basic h2 {
   cursor: pointer;
   font-size: 14px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 .originBasicRow {
   display: flex;

src/views/ordinaryPage/index.less

@@ -44,9 +44,9 @@
         position: relative;
         height: 16.57vh;
         margin-bottom: 0vh;
-        background: rgba(0, 0, 0, 0.49);
+        //background: rgba(0, 0, 0, 0.49);
         border-radius: 2.08vw;
-        border: 1px solid #707070;
+        //border: 1px solid #707070;
         width: auto;
         margin-left: 68vw;
         margin-right: 1.85vw;

src/views/ordinaryPage/index.vue

@@ -427,6 +427,54 @@
           alt=""
         />
       </div> -->
+      <div
+        class="origin-basic backgroundBox"
+        v-show="currentBench.type == 2"
+        @dblclick="handleInfoDblClick(currentBench.benchId)"
+      >
+        <h2 @click="bmMapItemActivate">{{ currentBench.name }} 🔗</h2>
+        <div class="originBasicRow">
+          <div>
+            <span>Location:</span>
+            <span>Automation Lab-7E</span>
+          </div>
+          <div>
+            <span>MU_SW</span>
+            <span>{{ currentBench.MU_SW }}</span>
+          </div>
+        </div>
+        <div class="originBasicRow">
+          <div>
+            <span>Cluster</span>
+            <span>{{ currentBench.Cluster }}</span>
+          </div>
+          <div>
+            <span>Market</span>
+            <span>{{ currentBench.Market }}</span>
+          </div>
+        </div>
+        <div class="originBasicRow">
+          <div>
+            <span>Box IP</span>
+            <span>{{ currentBench.ip }}</span>
+          </div>
+          <div>
+            <span>Box Version</span>
+            <span>{{ currentBench.equipment?.version }}</span>
+          </div>
+        </div>
+      </div>
+      <div
+        class="secondScreen"
+        v-if="benchDisplayLowerVisible"
+        @click="switchScreen"
+      >
+        <img
+          class="bmBenchImg bmBenchImgLower"
+          :src="currentScreen == 'upper' ? benchImgLower : benchImgUpper"
+          alt=""
+        />
+      </div>
       <div class="ordinary-list">
         <TabList
           :tabs="tabs"
@@ -478,6 +526,9 @@
           :currentScreen="currentScreen"
           :benchImgLower="benchImgLower"
           :benchImgUpper="benchImgUpper"
+          :readyCount="readyCount"
+          :occupiedCount="occupiedCount"
+          :offlineCount="offlineCount"
         ></TabList>
       </div>
     </div>
@@ -824,6 +875,8 @@ export default {
         //console.log('element',element);
         if (element.status == "ready") {
           readyCount++;
+        } else if (element.status == "error") {
+          offlineCount++;
         } else if (element.status == "offline") {
           offlineCount++;
         } else {
@@ -2095,7 +2148,7 @@ export default {
     pressPtt() {
       let self = this;
       ws.press_ptt({
-        benchId: this.selectedBenchList[0].benchId,
+        benchId: String(this.connetedBenchId),
       }).then(
         (res) => {},
         (rej) => {}
@@ -2266,6 +2319,7 @@ export default {
             this.currentBench.selected = true;
           }
         }
+        bus.emit("benchInfoVisible", this.currentBench);
       });
     },
     handleListDbClick(benchId, itemtype) {
@@ -3125,7 +3179,7 @@ export default {
 }
 .origin-basic {
   padding: 15px 20px;
-  color: #ccc;
+  color: #fff;
   font-size: 12px;
 }
 .origin-basic div {
@@ -3137,7 +3191,7 @@ export default {
 .origin-basic h2 {
   cursor: pointer;
   font-size: 14px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 .origin-map {
   background-color: rgba(117, 117, 117, 0.8);
@@ -3884,7 +3938,7 @@ export default {
 }
 .origin-basic {
   padding: 15px 20px;
-  color: #ccc;
+  color: #fff;
   font-size: 12px;
 }
 .origin-basic div {
@@ -3896,7 +3950,7 @@ export default {
 .origin-basic h2 {
   cursor: pointer;
   font-size: 14px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 .originBasicRow {
   display: flex;

src/views/ordinaryPage/square.less

@@ -43,13 +43,13 @@
     }
   
     .square-count {
-      height: 22.38vh;
+      height: 15.38vh;
       margin-bottom: 1.85vh;
-      background: rgba(0, 0, 0, 0.49);
+      // background: rgba(0, 0, 0, 0.49);
       border-radius: 2.08vw;
-      border: 1px solid #707070;
-      margin-left: 1.56vw;
-      margin-top: 11.29vh;
+      // border: 1px solid #707070;
+      // margin-left: 1.56vw;
+      // margin-top: 11.29vh;
       padding: 1.75vh 2.08vw;
       color: #dfdfdf;
       font-size: 16px;

src/views/squarePage/list.vue

@@ -632,7 +632,7 @@ export default {
 .origin-basic h2 {
   cursor: pointer;
   font-size: 14px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 
 :deep() .square {