guoxiaohuan 4 年之前
父节点
当前提交
25274bf207
共有 3 个文件被更改,包括 28 次插入24 次删除
  1. 21 17
      src/components/Legend/src/legend.vue
  2. 6 6
      src/views/equipment/fenbuPic.vue
  3. 1 1
      src/views/room/index.vue

+ 21 - 17
src/components/Legend/src/legend.vue

@@ -6,7 +6,7 @@
 <template>
     <div>
         <div class='legend-container'>
-            <div class='legend' @click='showTl'>图例</div>
+            <div class='legend' @click='showTl' v-if='floors.length>0'>图例</div>
             <el-collapse-transition>
                 <div class='legend-tab' v-if='show'>
                     <div class='legend-table'>
@@ -37,7 +37,17 @@
                 </div>
             </el-collapse-transition>
         </div>
-        <div class='edit_map'>
+
+        <!-- 单独展示新增分布图 -->
+        <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 />
+                <!-- </p> -->
+            </el-tooltip>
+        </div>
+
+        <div class='edit_map' v-else>
             <!-- 备注编辑器 -->
             <el-tooltip effect='dark' content='编辑备注' placement='left'>
                 <span v-if='systemName != "土建系统"' class='bjtk' @click='legendClik'>备注</span>
@@ -49,7 +59,7 @@
                 </p>
             </el-tooltip>
             <!-- 新增分布图 -->
-            <el-tooltip effect='dark' content='新增分布图' placement='left'>
+            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
                     <img src='@/assets/imgs/xzfbt.png' alt />
                 </p>
@@ -64,14 +74,6 @@
                 <i class='el-icon-edit' style='color:#fff;font-size:16px;'></i>
             </span>
         </div>
-        <!-- 单独展示新增分布图 -->
-        <div class='edit_map1' v-if='1!=1' @click='addFloor'>
-            <el-tooltip effect='dark' content='新增分布图' placement='left'>
-                <!-- <p class='tltk' style='margin-left: -5px;'> -->
-                <img src='@/assets/imgs/xzfbt.png' alt />
-                <!-- </p> -->
-            </el-tooltip>
-        </div>
         <div class='select-floor' v-if='isFloor'>
             <p class='p1'>请选择需要创建“消防泵房引出管路分布图”的楼层</p>
             <p class='p2'>
@@ -120,7 +122,7 @@ export default {
     computed: {
         ...mapGetters(['plazaId', 'fmapID', 'floorSelect'])
     },
-    props: ['systemName'],
+    props: ['systemName', 'floors'],
     components: { lengendView, legendRemarks, lengendEdit },
     methods: {
         testClick(data) {},
@@ -134,14 +136,13 @@ export default {
                 categoryId: this.$cookie.get('categoryId'),
                 projectId: this.$store.state.plazaId,
                 BuildingID: '1',
-                FloorID: this.$cookie.get('floorNow'),
-                Pub: true //是否获取草稿
+                FloorID: this.$cookie.get('floorNow')
             }
 
             let data = {}
             queryRead({ data, postParams }).then(res => {
-                //console.log('备注', res.data.Data[0].Note)
-                if (res.data.Data[0].Note) {
+                console.log('备注', res)
+                if (res.data.Data && res.data.Data[0].Note) {
                     let note = res.data.Data[0].Note
                     if (note.search(this.text1) != -1 && note.search(this.text2) != -1) {
                         this.remarksText = `${note}`
@@ -278,7 +279,9 @@ export default {
             this.isFloor = false
         }
     },
-    mounted() {}
+    mounted() {
+        console.log(this.floors)
+    }
 }
 </script>
 <style lang="less" scoped>
@@ -374,6 +377,7 @@ export default {
 .edit_map1 {
     position: fixed;
     bottom: 28px;
+    right: 30px;
     z-index: 1;
     .select-floor {
         width: 288px;

+ 6 - 6
src/views/equipment/fenbuPic.vue

@@ -1,7 +1,7 @@
 <template>
     <div class='fenbu-box'>
         <!-- 图例 -->
-        <div class='legend-boxs' v-if='floors.length>0'>
+        <div class='legend-boxs'>
             <Legend :floors='floors'></Legend>
         </div>
         <floor-list v-if='floors.length>0' :floorsArr='floors' :type='1' @emitFloor='emitFloor' :id='"floor"'></floor-list>
@@ -67,12 +67,12 @@ export default {
                     this.floors = []
                 } else {
                     floor = res.Content
-                    this.floorsArr.forEach(el=>{
-                        floor.forEach(ele=>{
-                            if(ele.floorId == el.gname){
+                    this.floorsArr.forEach(el => {
+                        floor.forEach(ele => {
+                            if (ele.floorId == el.gname) {
                                 this.floors.push({
-                                    gname:el.gname,
-                                    code:el.code
+                                    gname: el.gname,
+                                    code: el.code
                                 })
                             }
                         })

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

@@ -812,7 +812,7 @@ export default {
             this.smsxtArr = []
             let params = {
                 getParams: {
-                    locationid: '5209',
+                    locationid: '1890',
                     plazaId: this.plazaId
                 }
             }