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

src/components/SearchBar/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="search-box">
     <div class="iconBtnBox">
+      <div class="iconBtn backBtn" @click="goBack" v-if="goBackVisible"></div>
       <div class="iconBtn mapBtn" @click="modeChange"></div>
       <div class="iconBtn homeBtn" @click="goHome"></div>
     </div>
@@ -30,6 +31,11 @@ export default {
       show: false,
     };
   },
+  computed: {
+    goBackVisible: () => {
+      return window.location.href.indexOf("ordinaryPage") == -1;
+    },
+  },
   methods: {
     onFocus() {
       this.show = true;
@@ -43,6 +49,13 @@ export default {
       this.show = false;
       this.$emit("blur");
     },
+    goBack() {
+      if (window.location.href.indexOf("squarePage") !== -1) {
+        window.location.href = "/?m=8b934420_ZJUb_b6f9";
+      } else if (window.location.href.indexOf("originPage") !== -1) {
+        window.location.href = "/squarePage";
+      }
+    },
     modeChange() {
       if (window.location.href.indexOf("home") !== -1) {
         window.location.href = "/?m=8b934420_ZJUb_b6f9";
@@ -133,6 +146,10 @@ export default {
   cursor: pointer;
 }
 
+.backBtn {
+  background-image: url(../../assets/back.png);
+}
+
 .mapBtn {
   background-image: url(../../assets/3d.png);
 }

src/views/ordinaryPage/index.vue

@@ -1830,7 +1830,7 @@
   font-size: 12px;
 }
 .origin-basic div {
-  margin-bottom: 10px;
+  margin-bottom: 5px;
 }
 .origin-basic div span {
   margin-right: 12px;

src/views/originPage/index.less

@@ -2,6 +2,7 @@
   display: flex;
   // float:right;
   justify-content: flex-end;
+  height: 100%;
   .origin-left {
     display: flex;
     width: 63.48vw;
@@ -81,11 +82,11 @@
     display: flex;
     flex-direction: column;
     justify-content: center;
-    padding: 20px;
+    padding: 0 20px;
   }
 
   .origin-basic {
-    height: 26.38vh;
+    height: 130px;
     margin-bottom: 1.85vh;
     background: rgba(0, 0, 0, 0.49);
     border-radius: 2.08vw;

src/views/originPage/list.vue

@@ -206,29 +206,35 @@
         @dblclick="handleInfoDblClick(currentBench.benchId)"
       >
         <h2 @click="bmMapItemActivate">{{ currentBench.name }} 🔗</h2>
-        <div>
-          <span>Location:</span>
-          <span>Automation Lab-7E</span>
-        </div>
-        <div>
-          <span>MU_SW</span>
-          <span>{{ currentBench.MU_SW }}</span>
-        </div>
-        <div>
-          <span>Cluster</span>
-          <span>{{ currentBench.Cluster }}</span>
-        </div>
-        <div>
-          <span>Market</span>
-          <span>{{ currentBench.Market }}</span>
+        <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>
-          <span>Box IP</span>
-          <span>{{ currentBench.ip }}</span>
+        <div class="originBasicRow">
+          <div>
+            <span>Cluster</span>
+            <span>{{ currentBench.Cluster }}</span>
+          </div>
+          <div>
+            <span>Market</span>
+            <span>{{ currentBench.Market }}</span>
+          </div>
         </div>
-        <div>
-          <span>Box Version</span>
-          <span>{{ currentBench.equipment?.version }}</span>
+        <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
@@ -2293,6 +2299,13 @@ export default {
   font-size: 14px;
   margin-bottom: 15px;
 }
+.originBasicRow {
+  display: flex;
+  margin-bottom: 0 !important;
+}
+.originBasicRow > div {
+  width: 100%;
+}
 .ready {
   color: #65c94c !important;
   font-size: 30px;

src/views/squarePage/index.less

@@ -11,7 +11,7 @@
       height: 7.4vh;
       width: 44.9vw;
       margin-top: 11.29vh;
-      margin-bottom: 7.87vh;
+      margin-bottom: 2vh;
     }
 
     .square-map {