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

src/components/floorMap/index.vue

@@ -8,7 +8,7 @@
             <canvasFun @fit='fit' @savePng='savePng' @saveSvg='saveSvg' @saveJson='saveJson' @scale='scale' @showText='showText' ref='canvasFun'></canvasFun>
         </div>
         <room-box ref='boxRoom'></room-box>
-        <equip-detail ref='equipDetail'></equip-detail>
+        <equip-detail ref='equipDetail' :key='equipKey'></equip-detail>
         <el-popover ref='popover' placement='right' trigger='manual' v-model='visible' width='380'>
             <!-- <div style="text-align: right;margin-bottom: 10px;">
                 <span style="float: left;">对应的工程信息化信息</span>
@@ -138,6 +138,7 @@ export default {
             activeItem: null,
             showBtnWell: false,
             count: 0, // 顶楼为多张图时计数器
+            equipKey: 1, //设备弹窗使用key值,解决打开弹窗数据为上次弹窗的数据
         }
     },
     props: {
@@ -216,7 +217,10 @@ export default {
         // 查看浮层设备详情
         handleClickEquipDetail(row) {
             if (row.assetnum) {
-                this.$refs.equipDetail.open({ row: JSON.stringify(row) })
+                this.equipKey++
+                this.$nextTick(() => {
+                    this.$refs.equipDetail.open({ row: JSON.stringify(row) })
+                })
             }
         },
         // handleClickEquipDetail(row) {

src/utils/ganttChart/GanttChart_day.js

@@ -82,8 +82,10 @@ GanttChartDay.prototype.toggle = function(index) {
     } else {
         this.tasks[index].open = true
     }
-    this.processData()
-    this.drawTasks()
+    this.gCanvas.destroy()
+    this.initDrawingReady()
+    // this.processData()
+    // this.drawTasks()
 }
 
 /**

src/utils/ganttChart/GanttChart_month.js

@@ -83,8 +83,10 @@ GanttChartMonth.prototype.toggle = function(index) {
     } else {
         this.tasks[index].open = true
     }
-    this.processData()
-    this.drawTasks()
+    this.gCanvas.destroy()
+    this.initDrawingReady()
+//     this.processData()
+//     this.drawTasks()
 }
 
 /**
@@ -561,7 +563,6 @@ GanttChartMonth.prototype.drawTasks = function() {
                         }
                     })
                 })
-
                 taskGroup.show()
             } else {
                 if (topTask.gGroup) {

src/views/other/zhsxOtherTable2.vue

@@ -196,11 +196,8 @@ export default {
                 conclusion = res.data.data.sms_dsfrw.conclusion ? res.data.data.sms_dsfrw.conclusion : []
                 if (status2.length > 0) {
                     status2.forEach((el) => {
-                        let obj = {
-                            id: el.key,
-                            name: el.value,
-                        }
-                        status2.push(obj)
+                        el.id = el.key
+                        el.name = el.value
                     })
                     this.status2 = this.allArr.concat(status2)
                 }