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

src/uwb-sample.js

@@ -820,20 +820,20 @@ export function uwbMain(domId, modelWidth, modelHeight, finalMode, callback) {
               let m = intersects[z];
               if (m && m.object && (m.object.userData.type == 'water')) {
                 console.log('===== bench selected =====')
-                window.store.dispatch('benchList/setMouseOverBench', {
-                  bench_id: m.object.userData.benchId,
-                  pageX: event.x,
-                  pageY: event.y,
-                  status: true
-                })
+                //window.store.dispatch('benchList/setMouseOverBench', {
+                //  bench_id: m.object.userData.benchId,
+                //  pageX: event.x,
+                //  pageY: event.y,
+                //  status: true
+                //})
                 break;
               } else {
-                window.store.dispatch('benchList/setMouseOverBench', {
-                  bench_id: m.object.userData.benchId,
-                  pageX: event.x,
-                  pageY: event.y,
-                  status: false
-                })
+                //window.store.dispatch('benchList/setMouseOverBench', {
+                //  bench_id: m.object.userData.benchId,
+                //  pageX: event.x,
+                //  pageY: event.y,
+                //  status: false
+                //})
               }
             }
             bool = false;

src/views/ordinaryPage/index.vue

@@ -68,7 +68,7 @@
             <!-- <img src="../../images/map.png" /> -->
             <div class="vr-bg" id="vr-bg-container"></div>
             <div id="playersmall">
-              <div v-if="false"
+              <div
                   v-for="(item, key) in benchList"
                   :key="key"
                   class="bmMapItem el-icon-location"
@@ -77,7 +77,7 @@
                     top: item.top + 'px', 
                   }"
                   :class="item.status"
-                  @click="bmMapItemSelect(key)"
+                  @mouseover="bmMapItemSelect(key)"
                 >
                 <Transition v-if="item.selected">
                     <template>
@@ -1280,7 +1280,7 @@ export default {
         var currentBench = this.benchList.find((b) => b.id == item.benchId);
         if (currentBench) {
           //console.log('currentBench',currentBench);
-          currentBench.left = item.x - 548 + 59;
+          currentBench.left = item.x - 548 + 48;
           currentBench.top = item.y - 137 - 150 + 11;
           currentBench.benchId = item.benchId;
           currentBench.benchType = item.benchType;
@@ -4266,7 +4266,7 @@ export default {
   font-size: 30px;
 }
 .occupied {
-  color: #478bc3 !important;
+  color: #478bc300 !important;
   font-size: 30px;
 }
 .offline {
@@ -4274,7 +4274,7 @@ export default {
   font-size: 30px;
 }
 .offline {
-  color: red !important;
+  color: #ff000000 !important;
   font-size: 30px;
 }
 .bmInfoMsSlideNameStatus.ready {
@@ -4347,10 +4347,10 @@ export default {
   background-color: #65c94c00 !important;
 }
 .occupied {
-  background-color: #478bc3 !important;
+  background-color: #478bc300 !important;
 }
 .offline {
-  background-color: #cdd0cf !important;
+  background-color: #cdd0cf00 !important;
 }
 .error {
   background-color: red !important;

src/views/ordinaryPage/origin.less

@@ -39,7 +39,7 @@
         );
         border-radius: 79px 79px 79px 79px;
         position: absolute;
-        margin-top: 74.7vh;
+        margin-top: 81.9vh;
         z-index: 3;
         color: #fff;
         display: flex;