合并华工代码

src/views/originPage/list.vue

@@ -157,13 +157,13 @@
       />
       <el-row class="bench-button">
         <el-col :span="5" class="btn-item" style="text-align: center"
-          >B9NP-01</el-col
+          >{{ currentBench.name }}</el-col
         >
         <el-col :span="3" class="btn-item">
             <img @click="connectAudioDevice('collectAudio')" src="../../images/sound.png"/>
         </el-col>
-        <el-col :span="3">
-            <i @click="connectAudioDevice('playAudio')" class="el-icon-microphone"></i> 
+        <el-col :span="3" class="btn-item">
+            <img @click="connectAudioDevice('playAudio')" src="../../images/mic.png"/>
         </el-col>
         <el-col :span="3" class="btn-item">
             <img @click="tapModeControl" src="../../images/pointer.png"/>
@@ -174,8 +174,8 @@
         <el-col :span="3" class="btn-item">
             <img @click="pressPtt" src="../../images/robot.png"/>
         </el-col>
-        <el-col :span="3">
-            <i @click="gotoGrid" class="el-icon-s-grid"></i>
+        <el-col :span="3" class="btn-item">
+            <img @click="gotoGrid" src="../../images/grid.png"/>
         </el-col>
       </el-row>
     </div>
@@ -1562,23 +1562,25 @@ export default {
 .bmBench {
   width: 100%;
   /* height: 300px; */
-  padding: 5px 10px;
   box-sizing: border-box;
 }
 
 .bmBenchBox {
   font-size: 0;
-  margin-top: 5px;
+  /* margin-top: 5px; */
   position: relative;
   display: flex;
   justify-content: center;
+  background-color: #000;
 }
 
 .bmBenchImg {
   /* width: 100%;
   height: 285px; */
   /* width: 100%; */
-  height: 100%;
+  background-color: #000;
+  padding: 80px;
+  /* height: 100%; */
   border-radius: 6px;
 }
 

src/views/squarePage/index.less

@@ -12,20 +12,20 @@
       margin-bottom: 7.87vh;
     }
     .square-map {
+      overflow-y: auto;
       position: relative;
       width: 63.34vw;
       height: 67.79vh;
-      border-radius: 40px;
       .grid-item-close {
-        margin-left: 17.09vw;
-        margin-top: -19.94vh;
+        margin-left: 16.69vw;
+        margin-top: -21.94vh;
         margin-bottom: 14.5vh;
         
       }
       .grid-item {
-        width: 20.1vw;
+        width: 18.6vw;
         height: 16.74vh;
-        margin-right: 1.09vw;
+        margin-right: 1.39vw;
         margin-bottom: 1.94vh;
         img {
           width: 100%;

src/views/squarePage/list.vue

@@ -8,15 +8,18 @@
                 ref="searchbar"
             />
             <div class="square-map">
-                <el-row >
+                <el-row>
                     <el-col v-for="item in images" :key="item" :span="8">
-                      
-                      <div class="grid-item">
-                        <img :src="item.url" @click="handleClickImg(item.alt)" />
-                      </div>
-                      <div class="grid-item-close">
-                        <img src="../../images/closeremotebench.png" @click="handleCloseImg(item.alt)"/>
+                      <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)" />
+                          </div>
+                          <div class="grid-item-close">
+                            <img width="30px" src="../../images/closeremotebench.png" @click="handleCloseImg(item.alt)"/>
+                          </div>
                       </div>
+
                     </el-col>
                 </el-row>
             </div>