deepsea 1 год назад
Родитель
Сommit
cf46c20d1d
2 измененных файлов с 17 добавлено и 15 удалено
  1. 1 1
      src/views/ordinaryPage/index.less
  2. 16 14
      src/views/ordinaryPage/index.vue

+ 1 - 1
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;

+ 16 - 14
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>