guoxiaohuan 4 years ago
parent
commit
ce05d3f9cb

+ 3 - 3
src/components/Legend/src/legend.vue

@@ -6,7 +6,7 @@
 <template>
     <div>
         <div class='legend-container'>
-            <div class='legend' @click='showTl' v-if='floors.length>0'>图例</div>
+            <div class='legend' @click='showTl' v-if='type==1'>图例</div>
             <el-collapse-transition>
                 <div class='legend-tab' v-if='show'>
                     <div class='legend-table'>
@@ -39,7 +39,7 @@
         </div>
 
         <!-- 单独展示新增分布图 -->
-        <div class='edit_map1' v-if='floors.length<=0' @click='addFloor'>
+        <div class='edit_map1' v-if='floors.length==0' @click='addFloor'>
             <el-tooltip effect='dark' content='新增分布图' placement='left'>
                 <!-- <p class='tltk' style='margin-left: -5px;'> -->
                 <img src='@/assets/imgs/xzfbt.png' alt />
@@ -122,7 +122,7 @@ export default {
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'floorSelect'])
     },
-    props: ['systemName', 'floors'],
+    props: ['systemName', 'floors', 'type'],
     components: { lengendView, legendRemarks, lengendEdit },
     methods: {
         testClick(data) {},

+ 5 - 4
src/components/floorList.vue

@@ -6,7 +6,7 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div v-if='floorsArr.length>5'>
+            <div v-if='floorsArr.length>8'>
                 <i
                     class='el-icon-caret-top icon-top'
                     :class='{disabled:currentFloorId == floorsArr[0].seq }'
@@ -18,7 +18,8 @@
                 <i class='el-icon-caret-top icon-top' :class='{disabled:currentFloorId == floorsArr[0].seq }' v-else style='color:#ccc'></i>
             </div>
             <div class='floor-out'>
-                <div class='floor-center' :style='{ marginTop : marginTop }'>
+                <!-- :style='{ marginTop : marginTop }' -->
+                <div class='floor-center'>
                     <div
                         class='floor-item'
                         :class='item.seq == currentFloorId?"isActive":""'
@@ -28,7 +29,7 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div v-if='floorsArr.length>5'>
+            <div v-if='floorsArr.length>8'>
                 <i
                     class='el-icon-caret-bottom icon-bottom'
                     :class='{disabled:currentFloorId == floorsArr[floorsArr.length-1].seq }'
@@ -243,7 +244,7 @@ export default {
         padding: 28px 4px;
         text-align: center;
         .floor-out {
-            height: 160px;
+            height: 260px;
             overflow: hidden;
             // overflow-y: auto;
             position: relative;

+ 3 - 2
src/views/equipment/fenbuPic.vue

@@ -2,7 +2,7 @@
     <div class='fenbu-box'>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :floors='floors'></Legend>
+            <Legend :floors='floors' type='0'></Legend>
         </div>
         <floor-list v-if='floors.length>0' :floorsArr='floors' :type='1' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <div class='additional-box' v-if='floors.length>0'>
@@ -78,11 +78,12 @@ export default {
                         })
                     })
                 }
+                console.log(this.floors)
             })
         }
     },
     mounted() {
-        this.getFloorData()
+        // this.getFloorData()
         // this.$refs.floorMap.init(this.floorInfo.gname)
     }
 }

+ 1 - 1
src/views/equipment/index.vue

@@ -25,7 +25,7 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend :systemName='systemName'></Legend>
+                            <Legend :systemName='systemName' :floor='floorsArr' type='1'></Legend>
                         </div>
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>

+ 1 - 1
src/views/floorFunc/index.vue

@@ -5,7 +5,7 @@
         </div>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend></Legend>
+            <Legend :floor='floorsArr' type='1'></Legend>
         </div>
         <floor-list v-if='floorsArr.length>0' :floorsArr='floorsArr' :type='1' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         <!-- <div class='additional-box'>