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

src/components/TabList/index.vue

@@ -375,7 +375,7 @@
               ></div>
               <div>{{ planName }}</div>
             </div>
-            <div class="control-panel">
+            <div class="control-panel" v-if="false">
               <el-col :span="12">
                 <el-select
                   v-model="projectValue"

src/store/modules/common/mutations.js

@@ -108,18 +108,16 @@ export default {
       setTimeout(() => {
         
         let mapDom = document.getElementsByClassName("ordinary-map-container")[0];
-          let style = getComputedStyle(mapDom);
-          let width = parseFloat(style.width);
-          let height = parseFloat(style.height);
-        window.renderWidth = width * 1.8;
-        window.renderHeight = height * 1.8;
-        window.sdkInstance.sceneRenderer.updateScreenSize(width, height);
-        element.width = (width * 2) * 1.8;
-        element.height = (height * 2) * 1.8;
-        element.style.width = (width * 1.8)+'px';
-        element.style.height = (height * 1.8)+'px';
-        element.style.marginLeft = ((width - (width * 1.8)) / 2) + 'px';
-        element.style.marginTop = ((height - (height * 1.8)) / 2) + 'px';
+        let style = getComputedStyle(mapDom);
+        let width = parseFloat(style.width);
+        let height = parseFloat(style.height);
+
+        let ratio = 1.8;
+        window.renderWidth = width * ratio;
+        window.renderHeight = height * ratio;
+        window.sdkInstance.sceneRenderer.updateScreenSize(width * ratio, height * ratio);
+        element.style.marginLeft = ((width - (width * ratio)) / 2) + 'px';
+        element.style.marginTop = ((height - (height * ratio)) / 2) + 'px';
         let playersmall = document.getElementById('playersmall')
         playersmall.appendChild(element)
         setTimeout(() => {

src/views/ordinaryPage/index.less

@@ -16,7 +16,7 @@
       margin-top: 11.29vh;
       margin-bottom: 2.13vh;
     }
-
+    .filter-bench-list,
     .ordinary-map-container {
       overflow: hidden;
       position: relative;

src/views/ordinaryPage/index.vue

@@ -53,10 +53,21 @@
             </el-col>
           </el-row>
         </div>
+        <div class="filter-bench-list" v-show="isOpen" z-index="9999">
+          <dropdown :is-open="isOpen" ref="dropdown">
+              <template v-slot:table>
+                <table-component
+                  :data="filterBenchList"
+                  :filters="filters"
+                  :row-class-name="rowClassName"
+                ></table-component>
+              </template>
+            </dropdown>
+        </div>
         <div
-          v-show="!isConnected && !isOpenSquare"
+          v-show="!isConnected && !isOpenSquare && !isOpen"
           class="ordinary-map-container"
-          z-index="9999"
+          z-index="9998"
         >
           <div class="ordinary-map" id="ordinary-map">
             <!-- <img src="../../images/map.png" /> -->
@@ -76,15 +87,6 @@
               </div>
             </div> -->
             </div>
-            <dropdown :is-open="isOpen" ref="dropdown">
-              <template v-slot:table>
-                <table-component
-                  :data="filterBenchList"
-                  :filters="filters"
-                  :row-class-name="rowClassName"
-                ></table-component>
-              </template>
-            </dropdown>
           </div>
 
           <div class="ordinary-map-hidden" v-if="false">
@@ -192,7 +194,7 @@
             </div>
           </div>
         </div>
-        <div v-show="isConnected && !isOpenSquare" class="origin-map">
+        <div v-show="isConnected && !isOpenSquare && !isOpen" class="origin-map">
           <Transition name="slide">
             <div class="bmMap" v-if="false">
               <dropdown :is-open="isOpen" ref="dropdown">
@@ -333,7 +335,7 @@
           <img :src="mainSnapshot" />
         </div>
         <image-list
-          v-show="isConnected && !isOpenSquare"
+          v-show="isConnected && !isOpenSquare && !isOpen"
           :images="images"
           :page-size="pageSize"
           :current-page="currentPage"
@@ -342,7 +344,7 @@
           @next-page="nextPage"
           class="image-container"
         />
-        <el-row v-show="isConnected && !isOpenSquare" class="bench-button">
+        <el-row v-show="isConnected && !isOpenSquare && !isOpen" class="bench-button">
           <el-col :span="5" class="btn-item" style="text-align: center">{{
             currentBench.name
           }}</el-col>
@@ -1035,7 +1037,8 @@ export default {
   },
   methods: {
     changeCurrentBench(benchId) {
-      this.$store.dispatch('common/set3dStatus', false);
+      this.isDetailVisible = false;
+      this.$store.dispatch("common/toggle3dStatus");
       this.selectBench(benchId);
     },
     myInterval(callback, interval) {