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

src/App.vue

@@ -23,5 +23,17 @@ export default {
   #app{
     height: 100vh;
   }
+
+  .backgroundBox{
+    /* border-radius: 50px;
+    background: #ababab7d;
+    box-shadow: 50px 20px 60px #8d8d8d, -50px -20px 60px #ffffff; */
+    border-radius: 50px;
+    /* background: linear-gradient(179deg, rgba(255,255,255,0.36) 0%, rgba(255,255,255,0) 100%); */
+    /* background: linear-gradient(135deg, rgb(0 0 0 / 36%) 0%, rgb(255 255 255 / 20%) 100%); */
+    background: #afafaf;
+    box-shadow:  20px 20px 60px #8d8d8d, -20px -20px 60px #ffffff;
+    /* box-shadow:  20px 20px 60px #bebebe; */
+  }
 </style>
 

src/components/SearchBar/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="search-box">
+  <div class="search-box backgroundBox">
     <div class="iconBtnBox">
       <div class="iconBtn backBtn" @click="goBack" v-if="goBackVisible"></div>
       <div class="iconBtn mapBtn" @click="modeChange"></div>
@@ -84,8 +84,8 @@ export default {
   display: flex;
   justify-content: space-around;
   align-items: center;
-  background-image: url(../../images/search.png);
-  background-color: transparent;
+  /* background-image: url(../../images/search.png); */
+  /* background-color: transparent; */
   background-size: 100% 100%;
   box-sizing: border-box;
   /* padding-right: 1.56vw; */

src/components/TabList/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div :class="[size, 'tabs']">
-    <div class="tab-buttons">
+    <div class="tab-buttons backgroundBox">
       <div v-for="(tab, index) in tabs" :key="index" :class="{ active: activeTab === index }" @click="changeTab(index)">
         {{ tab.title }}
       </div>
     </div>
-    <div class="tab-content" :class="tabClass" v-if="activeTab === 0">
+    <div class="tab-content backgroundBox" :class="tabClass" v-if="activeTab === 0">
       <div class="panel-container">
         <div class="list">
           <div v-for="(item, index) in activeTabItems" :key="index" class="item">
@@ -511,8 +511,8 @@ export default {
     padding-top: 1.48vh;
     padding-bottom: 1.48vh;
     margin-bottom: 2.13vh;
-    background: linear-gradient(179deg, rgba(255,255,255,0.36) 0%, rgba(255,255,255,0) 100%);
-    background-image: url(../../images/tab-buttons.png);
+    // background: linear-gradient(179deg, rgba(255,255,255,0.36) 0%, rgba(255,255,255,0) 100%);
+    // background-image: url(../../images/tab-buttons.png);
     background-size: 100% 100%;
     border-radius: 79px 79px 79px 79px;
     display: flex;
@@ -541,7 +541,7 @@ export default {
     // flex: 1;
     min-height: 40vh;
     overflow: scroll;
-    background-image: url(../../images/tab-content.png);
+    // background-image: url(../../images/tab-content.png);
     background-size: 100% 100%;
     padding: 1.75vh 1.51vw 0 1.51vw;
     border-radius: 2.08vw;

src/views/originPage/index.less

@@ -51,6 +51,7 @@
       .btn-item {
         height: 100%;
         img {
+          cursor: pointer;
           width: 2.23vw;
         }
       }
@@ -88,9 +89,9 @@
   .origin-basic {
     height: 130px;
     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;
+    // border: 1px solid #707070;
     margin-left: 1.56vw;
     
   }

src/views/originPage/list.vue

@@ -241,7 +241,7 @@
         ></status-bar>
       </div>
       <div
-        class="origin-basic"
+        class="origin-basic backgroundBox"
         v-show="currentBench.type == 2"
         @dblclick="handleInfoDblClick(currentBench.benchId)"
       >
@@ -1525,7 +1525,7 @@ export default {
     pressPtt() {
       let self = this;
       ws.press_ptt({
-        benchId: this.selectedBenchList[0].benchId,
+        benchId: String(this.connetedBenchId),
       }).then(
         (res) => {},
         (rej) => {}
@@ -2327,7 +2327,7 @@ export default {
 }
 .origin-basic {
   padding: 15px 20px;
-  color: #ccc;
+  color: #fff;
   font-size: 12px;
 }
 .origin-basic div {
@@ -2339,7 +2339,7 @@ export default {
 .origin-basic h2 {
   cursor: pointer;
   font-size: 14px;
-  margin-bottom: 15px;
+  margin-bottom: 10px;
 }
 .originBasicRow {
   display: flex;

src/views/squarePage/index.less

@@ -49,9 +49,9 @@
   .square-count {
     height: 22.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;
+    // border: 1px solid #707070;
     margin-left: 1.56vw;
     margin-top: 11.29vh;
     padding: 1.75vh 2.08vw;

src/views/squarePage/list.vue

@@ -43,7 +43,7 @@
       </div>
     </div>
     <div class="square-right">
-      <div class="square-count" v-show="!currentBench.selected">
+      <div class="square-count backgroundBox" v-show="!currentBench.selected">
         <status-bar
           :ready="readyCount"
           :occupied="occupiedCount"