Browse Source

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

shaun-sheep 4 years ago
parent
commit
14d5e07b4b

+ 2 - 1
src/components/Legend/src/legend.vue

@@ -487,11 +487,12 @@ export default {
         queryRemarksMethods() {},
         init() {
             // 图例
+            bus.$off('queryViewMethods') //解决触发多次监听
             bus.$on('queryViewMethods', () => {
-                // console.log('queryViewMethods')
                 this.queryView(false)
             })
             // 备注
+            bus.$off('queryRemarksMethods')
             bus.$on('queryRemarksMethods', res => {
                 let remarksText = ''
                 if (res) {

+ 5 - 2
src/views/equipment/eqDialog.vue

@@ -75,7 +75,7 @@
                                     :name='`${value.param.type_code}`'
                                     v-if='value.id.slice(2,4)=="YL" && value.param.type_code.slice(0,3)=="FBT"'
                                 >
-                                    <fenbuPic ref='fenbutu' :typecode='value.param.type_code'></fenbuPic>
+                                    <fenbuPic ref='fenbutu' v-if='showFenbuPic' :typecode='value.param.type_code'></fenbuPic>
                                 </el-tab-pane>
                             </template>
                         </template>
@@ -112,7 +112,8 @@ export default {
             diff: '', //区分给水排水
             rotationImg: [],
             tabLabel: '',
-            tabCount: []
+            tabCount: [],
+            showFenbuPic: false //显示楼层分布组件
         }
     },
     mounted() {},
@@ -159,6 +160,7 @@ export default {
                 this.initImage(this.typecode)
             }
             if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL' && this.typecode.slice(0, 3) == 'FBT') {
+                this.showFenbuPic = true
                 this.$nextTick(() => {
                     this.$refs.fenbutu[0] && this.$refs.fenbutu[0].openFloorMap()
                 })
@@ -257,6 +259,7 @@ export default {
          *  关闭弹窗,传回父组件,在父组件内 处理逻辑(关闭弹窗)
          */
         closeModal() {
+            this.showFenbuPic = false
             this.$emit('closeModal', true)
         }
     }

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

@@ -28,7 +28,13 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend :systemName='systemName' :floors='floorsArr' type='1' :editTips='`编辑${floorInfo.code}层${systemName}平面图`'></Legend>
+                            <Legend
+                                :key='keyLd'
+                                :systemName='systemName'
+                                :floors='floorsArr'
+                                type='1'
+                                :editTips='`编辑${floorInfo.code}层${systemName}平面图`'
+                            ></Legend>
                         </div>
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <div class='additional-box' v-if='fqPic.length>0'>
@@ -87,6 +93,7 @@ export default {
             type: '',
             objCount: [],
             keyFL: 'keyFL' + new Date().getTime(),
+            keyLd: 'keyLd_' + new Date().getTime(),
             ShowDialog: false //是否显示弹窗
         }
     },
@@ -150,6 +157,7 @@ export default {
         closeModal(flag) {
             this.ShowDialog = false
             this.keyFL = 'keyFL' + new Date().getTime()
+            this.keyLd = 'keyLd' + new Date().getTime()
         },
         //附加数据图片查看 showView为3展示状态
         additionalColl() {