bug修改

src/assets/iconfont/iconfont.json

@@ -616,7 +616,7 @@
     },
     {
       "icon_id": "30787119",
-      "name": "动物保护",
+      "name": "野生动物",
       "font_class": "dwbh",
       "unicode": "e603",
       "unicode_decimal": 58883
@@ -645,7 +645,7 @@
     {
       "icon_id": "30787123",
       "name": "森林防火队",
-      "font_class": "fireteam",
+      "font_class": "centerdata-t-forest-fireteam",
       "unicode": "e607",
       "unicode_decimal": 58887
     },
@@ -701,14 +701,14 @@
     {
       "icon_id": "30787132",
       "name": "起降点",
-      "font_class": "landing",
+      "font_class": "centerdata-t-forest-landing",
       "unicode": "e60f",
       "unicode_decimal": 58895
     },
     {
       "icon_id": "30787133",
       "name": "水源渠道",
-      "font_class": "channel",
+      "font_class": "centerdata-t-forest-channel",
       "unicode": "e610",
       "unicode_decimal": 58896
     },

src/views/datacenter.vue

@@ -459,6 +459,48 @@ export default {
             '                </div>' +
             '                </span>'):'')
           + '</div>'
+      }else if (resourceTable == 'centerdata_t_forest_fireteam') { //防火队
+        markersMap.icon = 'sj-icon-map-centerdata-t-forest-fireteam'
+        markersMap.lng = item.longitude
+        markersMap.lat = item.latitude
+        markersMap.bindPopupHtml = '<div class="map-tip">' +
+          '<span>' +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          '                  <h4>经纬度：' + (item.longitude?item.longitude:"") + ',' + (item.latitude?item.latitude:"") + '</h4>' +
+          '                </div>' +
+          '                </div>' +
+          '                </span>' +
+          '<span>' +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          '                  <h4>队伍名称：' + (item.name?item.name:"") + '</h4>' +
+          '                </div>' +
+          '                </div>' +
+          '                </span>' +
+          '<span>' +
+          '                  <div class="d-l-con">' +
+          '                  <div class="d-l-l-text">' +
+          '                  <h4>联系人：' + (item.fireteam_person?item.fireteam_person:"") + '</h4>' +
+          '                </div>' +
+          '                </div>' +
+          '                </span>' + (item.fireteam_tel?(
+            '<span>' +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            '                  <h4>联系电话：' + item.fireteam_tel + '</h4>' +
+            '                </div>' +
+            '                </div>' +
+            '                </span>'):'')
+          + (item.equipment?(
+            '<span>' +
+            '                  <div class="d-l-con">' +
+            '                  <div class="d-l-l-text">' +
+            '                  <h4>设备数量：' + item.equipment + '</h4>' +
+            '                </div>' +
+            '                </div>' +
+            '                </span>'):'')
+          + '</div>'
       } else if (resourceTable == 'centerdata_t_emergency_enterprise') { //应急企业
         markersMap.icon = 'sj-icon-map-centerdata-t-emergency-enterprise'
         markersMap.lng = item.longitude

src/views/firespread.vue

@@ -19,7 +19,9 @@
                   <div class="dia-left-top-carousel">
                     <el-carousel height="30px" direction="vertical" :interval="2000">
                       <el-carousel-item v-if="visuForestCloudYuAnBo!=null">
-                        <a :href="visuForestCloudYuAnBo.fileUrl">{{ visuForestCloudYuAnBo.reserveName }}</a>
+                        <el-tooltip class="item" effect="dark" :content="visuForestCloudYuAnBo.reserveName" placement="top-start">
+                          <a :href="visuForestCloudYuAnBo.fileUrl" ><span><div style=" width: 50px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;word-break: keep-all;">{{ visuForestCloudYuAnBo.reserveName }}</div></span></a>
+                        </el-tooltip>
                       </el-carousel-item>
                       <el-carousel-item v-else>
                         <a href="#">暂未关联预案</a>
@@ -991,7 +993,7 @@ import {
   getNewDataByDate,
   userFeginlist,
   fireControlViewList,
-  fireControlViewPoint
+  fireControlViewPoint, eventHandling
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1309,6 +1311,225 @@ export default {
       //添加新的行数
       this.dutysystemTableData.push(newValue)
     },
+    async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
+      this.eventStatusButton = eventStatus
+      let that=this
+      if (!isSend) {//事件弹窗
+        if (eventStatus == 'qs') {//签收
+          that.eventConfirmTitle = '事件签收'
+          let param = { parentId: that.eventType }
+          if(that.eventTypeXl != null){
+            that.sendEventType = that.eventTypeXl;
+          }else{
+            await listSJfl(param).then(res => {
+              //事件类型
+              if (res.code == 200) {
+                that.eventTypeList = res.data
+              }
+            })
+          }
+          await listYuAn().then(res => {
+            //关联预案
+            if (res.code == 200) {
+              that.guanLianYuAnList = res.data
+            }
+          })
+          await selectByeventCode(that.eventCode).then(res => {
+            //签收部门
+            if (res.code == 200) {
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
+            }
+          })
+          that.showEventConfirm = true
+        } else if (eventStatus == 'qr') {//确认
+          that.eventConfirmTitle = '事件确认'
+        } else if (eventStatus == 'wb') {//误报
+          that.eventConfirmTitle = '事件误报'
+          await selectByeventCode(that.eventCode).then(res => {
+            //签收部门
+            if (res.code == 200) {
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
+            }
+          })
+          that.showEventConfirm = true
+        } else if (eventStatus == 'cf') {//重复
+          that.eventConfirmTitle = '事件重复'
+          await selectByeventCode(that.eventCode).then(res => {
+            //签收部门
+            if (res.code == 200) {
+              that.deptOptions = res.data
+              that.deptNameitem = '签收部门'
+            }
+          })
+          that.showEventConfirm = true
+        } else if (eventStatus == 'ld') {//联动
+          await selectByeventCode(that.eventCode).then(res => {
+            //签收部门
+            if (res.code == 200) {
+              that.deptOptions = res.data
+              that.deptNameitem = '发起部门'
+            }
+          })
+          that.eventConfirmTitle = '事件联动'
+          /** 查询部门树结构 */
+          await deptTreeselect().then(response => {
+            that.deptOptionsLiandong = response.data
+          })
+          that.showEventConfirm = true
+        } else if (eventStatus == 'gd') {//归档填报
+          that.showEventConfirm_gd = true
+        }
+      } else {//事件提交后台
+        if (eventStatus == 'ld') {
+          //事件处理流程--联动
+          let array = that.$refs.LiandongDept.getCheckedNodes()
+          if (array != null && array.length > 0) {
+            for (let i = 0; i < array.length; i++) {
+              that.sendLianDongDept.push({ 'taskDeptId': array[i].id, 'taskDeptName': array[i].label })
+            }
+          }
+          if (that.sendTaskSource == '' || that.sendTaskSource == null) {
+            that.$message.error(`请选择任务来源!`)
+            return
+          }
+          if (that.sendTaskContent == '' || that.sendTaskContent == null) {
+            that.$message.error(`请输入任务内容!`)
+            return
+          }
+          if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
+            that.$message.error(`请输入任务标题!`)
+            return
+          }
+          if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
+            that.$message.error(`请选择任务联动部门!`)
+            return
+          }
+          if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+            that.$message.error(`请选择任务发起部门!`)
+            return
+          }
+          let param = {
+            sendDeptId: that.sendDeptId,
+            sendDept: that.sendDeptName,
+            eventCode: that.eventCode,
+            longitude: that.longitude,
+            latitude: that.latitude,
+            taskTitle: that.sendTaskTitle,
+            taskSource: that.sendTaskSource,
+            taskContent: that.sendTaskContent,
+            taskDept: that.sendLianDongDept
+          }
+          sendTask(param).then(res => {
+            if (res.code == 200) {
+              that.$message.success(`联动发起成功!`)
+              that.refreshEventDialog(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
+            }
+          })
+        } else if(eventStatus == 'cz'){
+          eventHandling(that.eventId,that.eventCode).then(res => {
+            if (res.code == 200) {
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
+            }
+          })
+        } else if (eventStatus == 'gd') {
+          if(that.eventType == 1){
+            let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;    //数字和两位小数
+            let number = /^[+]{0,1}(\d+)$/g;    //正整数
+
+            if(!double.test(that.table2.areaTotal)){
+              that.$message.error(`面积只能填写到小数后两位!`)
+              return
+            }
+            if(!number.test(that.table2.peopleTotal)){
+              that.$message.error(`人员请填写正整数!`)
+              return
+            }
+            if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
+              that.$message.error(`林木组成不能为空!`)
+              return
+            }
+            if(that.table2.forestToken == '' || that.table2.forestToken==null){
+              that.$message.error(`林令不能为空!`)
+              return
+            }
+            if(that.table2.porosities == '' || that.table2.porosities==null){
+              that.$message.error(`疏密度不能为空!`)
+              return
+            }
+          }
+
+
+          //事件处理流程--归档
+          let param = {
+            deptId: that.deptId,
+            eventCode: that.eventCode,
+            eventStatus: eventStatus,
+            id: that.eventId,
+            czlx: '',
+            forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
+            fireInformation: { eventId: that.eventCode, table2: that.table2 },
+            array: that.regionalFlagObj.array
+          }
+          updateCentereventTEventcatalogueStatus(param).then(res => {
+            if (res.code == 200) {
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm_gd = false
+              that.$emit('getEventList', that.calendarDay,10,1)
+              that.$emit('getSupermap', that.calendarDay)
+            }
+          })
+        } else {
+          if (eventStatus == 'qs' || eventStatus == 'wb' || eventStatus == 'cf') {
+            if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+              that.$message.error(`请选择部门!`)
+              return
+            }
+            if (eventStatus == 'qs') {
+              if (that.sendEventType == '' || that.sendEventType == null) {
+                that.$message.error(`请选择事件类型!`)
+                return
+              }
+            }
+          } else {
+            that.sendDeptId = that.deptId
+          }
+          //事件处理流程
+          let param = {
+            phones:that.sendUserFegin,
+            eventCode: that.eventCode,
+            deptId: that.sendDeptId,
+            deptName: that.sendDeptName,
+            eventStatus: eventStatus,
+            eventType: that.sendEventType,
+            id: that.eventId,
+            czlx: '',
+            cameraCode: that.cameraCode,
+            fireRadius: that.sendHuoZaiBanJing,
+            reserve: that.sendGuanLianYuAn,
+            fileList:eventStatus == 'qs'?this.eventLogList[this.eventLogList.length-1].fileVOs:[]
+          }
+          updateCentereventTEventcatalogueStatus(param).then(res => {
+            if (res.code == 200) {
+              that.$message.success(`处理成功!`)
+              that.refreshEvent(that.eventCode)
+              that.cancelEventConfirm_send()
+              that.showEventConfirm = false
+              that.$emit('getEventList', that.calendarDay,10,1)
+              that.$emit('getSupermap', that.calendarDay)
+            }
+          })
+        }
+      }
+    },
     getNewDataByDate(eventCode)
     {
       const that=this
@@ -1808,209 +2029,209 @@ export default {
      * eventStatusValue 事件状态
      * isSend 是否办理
      * */
-    async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
-      this.eventStatusButton = eventStatus
-      let that=this
-      if (!isSend) {//事件弹窗
-        if (eventStatus == 'qs') {//签收
-          that.eventConfirmTitle = '事件签收'
-          let param = { parentId: that.eventType }
-          await listSJfl(param).then(res => {
-            //事件类型
-            if (res.code == 200) {
-              that.eventTypeList = res.data
-            }
-          })
-          await listYuAn().then(res => {
-            //关联预案
-            if (res.code == 200) {
-              that.guanLianYuAnList = res.data
-            }
-          })
-          await selectByeventCode(that.eventCode).then(res => {
-            //签收部门
-            if (res.code == 200) {
-              that.deptOptions = res.data
-              that.deptNameitem = '签收部门'
-            }
-          })
-          that.showEventConfirm = true
-        } else if (eventStatus == 'qr') {//确认
-          that.eventConfirmTitle = '事件确认'
-        } else if (eventStatus == 'wb') {//误报
-          that.eventConfirmTitle = '事件误报'
-          await selectByeventCode(that.eventCode).then(res => {
-            //签收部门
-            if (res.code == 200) {
-              that.deptOptions = res.data
-              that.deptNameitem = '签收部门'
-            }
-          })
-          that.showEventConfirm = true
-        } else if (eventStatus == 'cf') {//重复
-          that.eventConfirmTitle = '事件重复'
-          await selectByeventCode(that.eventCode).then(res => {
-            //签收部门
-            if (res.code == 200) {
-              that.deptOptions = res.data
-              that.deptNameitem = '签收部门'
-            }
-          })
-          that.showEventConfirm = true
-        } else if (eventStatus == 'ld') {//联动
-          await selectByeventCode(that.eventCode).then(res => {
-            //签收部门
-            if (res.code == 200) {
-              that.deptOptions = res.data
-              that.deptNameitem = '发起部门'
-            }
-          })
-          that.eventConfirmTitle = '事件联动'
-          /** 查询部门树结构 */
-          await deptTreeselect().then(response => {
-            that.deptOptionsLiandong = response.data
-          })
-          that.showEventConfirm = true
-        } else if (eventStatus == 'gd') {//归档填报
-          that.showEventConfirm_gd = true
-        }
-      } else {//事件提交后台
-        if (eventStatus == 'ld') {
-          //事件处理流程--联动
-          let array = that.$refs.LiandongDept.getCheckedNodes()
-          if (array != null && array.length > 0) {
-            for (let i = 0; i < array.length; i++) {
-              that.sendLianDongDept.push({ 'taskDeptId': array[i].id, 'taskDeptName': array[i].label })
-            }
-          }
-          if (that.sendTaskSource == '' || that.sendTaskSource == null) {
-            that.$message.error(`请选择任务来源!`)
-            return
-          }
-          if (that.sendTaskContent == '' || that.sendTaskContent == null) {
-            that.$message.error(`请输入任务内容!`)
-            return
-          }
-          if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
-            that.$message.error(`请输入任务标题!`)
-            return
-          }
-          if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
-            that.$message.error(`请选择任务联动部门!`)
-            return
-          }
-          if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
-            that.$message.error(`请选择任务发起部门!`)
-            return
-          }
-          let param = {
-            sendDeptId: that.sendDeptId,
-            sendDept: that.sendDeptName,
-            eventCode: that.eventCode,
-            longitude: that.longitude,
-            latitude: that.latitude,
-            taskTitle: that.sendTaskTitle,
-            taskSource: that.sendTaskSource,
-            taskContent: that.sendTaskContent,
-            taskDept: that.sendLianDongDept
-          }
-          sendTask(param).then(res => {
-            if (res.code == 200) {
-              that.$message.success(`联动发起成功!`)
-              that.refreshEventDialog(that.eventCode)
-              that.cancelEventConfirm_send()
-              that.showEventConfirm = false
-            }
-          })
-
-        } else if (eventStatus == 'gd') {
-          let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;    //数字和两位小数
-          let number = /^[+]{0,1}(\d+)$/g;    //正整数
-
-          if(!double.test(that.table2.areaTotal)){
-            that.$message.error(`面积只能填写到小数后两位!`)
-            return
-          }
-          if(!number.test(that.table2.peopleTotal)){
-            that.$message.error(`人员请填写正整数!`)
-            return
-          }
-          if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
-            that.$message.error(`林木组成不能为空!`)
-            return
-          }
-          if(that.table2.forestToken == '' || that.table2.forestToken==null){
-            that.$message.error(`林令不能为空!`)
-            return
-          }
-          if(that.table2.porosities == '' || that.table2.porosities==null){
-            that.$message.error(`疏密度不能为空!`)
-            return
-          }
-
-          //事件处理流程--归档
-          let param = {
-            deptId: that.deptId,
-            eventCode: that.eventCode,
-            eventStatus: eventStatus,
-            id: that.eventId,
-            czlx: '',
-            forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
-            fireInformation: { eventId: that.eventCode, table2: that.table2 },
-            array: that.regionalFlagObj.array
-          }
-          updateCentereventTEventcatalogueStatus(param).then(res => {
-            if (res.code == 200) {
-              that.$message.success(`处理成功!`)
-              that.refreshEvent(that.eventCode)
-              that.cancelEventConfirm_send()
-              that.showEventConfirm_gd = false
-              that.$emit('getEventList', that.calendarDay,10,1)
-              that.$emit('getSupermap', that.calendarDay)
-            }
-          })
-        } else {
-          if (eventStatus == 'qs') {
-            if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
-              that.$message.error(`请选择部门!`)
-              return
-            }
-            if (eventStatus == 'qs') {
-              if (that.sendEventType == '' || that.sendEventType == null) {
-                that.$message.error(`请选择事件类型!`)
-                return
-              }
-            }
-          } else {
-            that.sendDeptId = that.deptId
-          }
-          //事件处理流程
-          let param = {
-            phones:that.sendUserFegin,
-            eventCode: that.eventCode,
-            deptId: that.sendDeptId,
-            deptName: that.sendDeptName,
-            eventStatus: eventStatus,
-            eventType: that.sendEventType,
-            id: that.eventId,
-            czlx: '',
-            cameraCode: that.cameraCode,
-            fireRadius: that.sendHuoZaiBanJing,
-            reserve: that.sendGuanLianYuAn
-          }
-          updateCentereventTEventcatalogueStatus(param).then(res => {
-            if (res.code == 200) {
-              that.$message.success(`处理成功!`)
-              that.refreshEvent(that.eventCode)
-              that.cancelEventConfirm_send()
-              that.showEventConfirm = false
-              that.$emit('getEventList', that.calendarDay,10,1)
-              that.$emit('getSupermap', that.calendarDay)
-            }
-          })
-        }
-      }
-    },
+    // async updateCentereventTEventcatalogueStatus(eventStatus, isSend) {
+    //   this.eventStatusButton = eventStatus
+    //   let that=this
+    //   if (!isSend) {//事件弹窗
+    //     if (eventStatus == 'qs') {//签收
+    //       that.eventConfirmTitle = '事件签收'
+    //       let param = { parentId: that.eventType }
+    //       await listSJfl(param).then(res => {
+    //         //事件类型
+    //         if (res.code == 200) {
+    //           that.eventTypeList = res.data
+    //         }
+    //       })
+    //       await listYuAn().then(res => {
+    //         //关联预案
+    //         if (res.code == 200) {
+    //           that.guanLianYuAnList = res.data
+    //         }
+    //       })
+    //       await selectByeventCode(that.eventCode).then(res => {
+    //         //签收部门
+    //         if (res.code == 200) {
+    //           that.deptOptions = res.data
+    //           that.deptNameitem = '签收部门'
+    //         }
+    //       })
+    //       that.showEventConfirm = true
+    //     } else if (eventStatus == 'qr') {//确认
+    //       that.eventConfirmTitle = '事件确认'
+    //     } else if (eventStatus == 'wb') {//误报
+    //       that.eventConfirmTitle = '事件误报'
+    //       await selectByeventCode(that.eventCode).then(res => {
+    //         //签收部门
+    //         if (res.code == 200) {
+    //           that.deptOptions = res.data
+    //           that.deptNameitem = '签收部门'
+    //         }
+    //       })
+    //       that.showEventConfirm = true
+    //     } else if (eventStatus == 'cf') {//重复
+    //       that.eventConfirmTitle = '事件重复'
+    //       await selectByeventCode(that.eventCode).then(res => {
+    //         //签收部门
+    //         if (res.code == 200) {
+    //           that.deptOptions = res.data
+    //           that.deptNameitem = '签收部门'
+    //         }
+    //       })
+    //       that.showEventConfirm = true
+    //     } else if (eventStatus == 'ld') {//联动
+    //       await selectByeventCode(that.eventCode).then(res => {
+    //         //签收部门
+    //         if (res.code == 200) {
+    //           that.deptOptions = res.data
+    //           that.deptNameitem = '发起部门'
+    //         }
+    //       })
+    //       that.eventConfirmTitle = '事件联动'
+    //       /** 查询部门树结构 */
+    //       await deptTreeselect().then(response => {
+    //         that.deptOptionsLiandong = response.data
+    //       })
+    //       that.showEventConfirm = true
+    //     } else if (eventStatus == 'gd') {//归档填报
+    //       that.showEventConfirm_gd = true
+    //     }
+    //   } else {//事件提交后台
+    //     if (eventStatus == 'ld') {
+    //       //事件处理流程--联动
+    //       let array = that.$refs.LiandongDept.getCheckedNodes()
+    //       if (array != null && array.length > 0) {
+    //         for (let i = 0; i < array.length; i++) {
+    //           that.sendLianDongDept.push({ 'taskDeptId': array[i].id, 'taskDeptName': array[i].label })
+    //         }
+    //       }
+    //       if (that.sendTaskSource == '' || that.sendTaskSource == null) {
+    //         that.$message.error(`请选择任务来源!`)
+    //         return
+    //       }
+    //       if (that.sendTaskContent == '' || that.sendTaskContent == null) {
+    //         that.$message.error(`请输入任务内容!`)
+    //         return
+    //       }
+    //       if (that.sendTaskTitle == '' || that.sendTaskTitle == null) {
+    //         that.$message.error(`请输入任务标题!`)
+    //         return
+    //       }
+    //       if (that.sendLianDongDept == '' || that.sendLianDongDept == null) {
+    //         that.$message.error(`请选择任务联动部门!`)
+    //         return
+    //       }
+    //       if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+    //         that.$message.error(`请选择任务发起部门!`)
+    //         return
+    //       }
+    //       let param = {
+    //         sendDeptId: that.sendDeptId,
+    //         sendDept: that.sendDeptName,
+    //         eventCode: that.eventCode,
+    //         longitude: that.longitude,
+    //         latitude: that.latitude,
+    //         taskTitle: that.sendTaskTitle,
+    //         taskSource: that.sendTaskSource,
+    //         taskContent: that.sendTaskContent,
+    //         taskDept: that.sendLianDongDept
+    //       }
+    //       sendTask(param).then(res => {
+    //         if (res.code == 200) {
+    //           that.$message.success(`联动发起成功!`)
+    //           that.refreshEventDialog(that.eventCode)
+    //           that.cancelEventConfirm_send()
+    //           that.showEventConfirm = false
+    //         }
+    //       })
+    //
+    //     } else if (eventStatus == 'gd') {
+    //       let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;    //数字和两位小数
+    //       let number = /^[+]{0,1}(\d+)$/g;    //正整数
+    //
+    //       if(!double.test(that.table2.areaTotal)){
+    //         that.$message.error(`面积只能填写到小数后两位!`)
+    //         return
+    //       }
+    //       if(!number.test(that.table2.peopleTotal)){
+    //         that.$message.error(`人员请填写正整数!`)
+    //         return
+    //       }
+    //       if(that.table2.forestComposition == '' || that.table2.forestComposition==null){
+    //         that.$message.error(`林木组成不能为空!`)
+    //         return
+    //       }
+    //       if(that.table2.forestToken == '' || that.table2.forestToken==null){
+    //         that.$message.error(`林令不能为空!`)
+    //         return
+    //       }
+    //       if(that.table2.porosities == '' || that.table2.porosities==null){
+    //         that.$message.error(`疏密度不能为空!`)
+    //         return
+    //       }
+    //
+    //       //事件处理流程--归档
+    //       let param = {
+    //         deptId: that.deptId,
+    //         eventCode: that.eventCode,
+    //         eventStatus: eventStatus,
+    //         id: that.eventId,
+    //         czlx: '',
+    //         forestFireLoss: { eventId: that.eventCode, table1: that.table1 },
+    //         fireInformation: { eventId: that.eventCode, table2: that.table2 },
+    //         array: that.regionalFlagObj.array
+    //       }
+    //       updateCentereventTEventcatalogueStatus(param).then(res => {
+    //         if (res.code == 200) {
+    //           that.$message.success(`处理成功!`)
+    //           that.refreshEvent(that.eventCode)
+    //           that.cancelEventConfirm_send()
+    //           that.showEventConfirm_gd = false
+    //           that.$emit('getEventList', that.calendarDay,10,1)
+    //           that.$emit('getSupermap', that.calendarDay)
+    //         }
+    //       })
+    //     } else {
+    //       if (eventStatus == 'qs') {
+    //         if (that.sendDeptId == '' || that.sendDeptId == null || that.sendDeptName == '' || that.sendDeptName == null) {
+    //           that.$message.error(`请选择部门!`)
+    //           return
+    //         }
+    //         if (eventStatus == 'qs') {
+    //           if (that.sendEventType == '' || that.sendEventType == null) {
+    //             that.$message.error(`请选择事件类型!`)
+    //             return
+    //           }
+    //         }
+    //       } else {
+    //         that.sendDeptId = that.deptId
+    //       }
+    //       //事件处理流程
+    //       let param = {
+    //         phones:that.sendUserFegin,
+    //         eventCode: that.eventCode,
+    //         deptId: that.sendDeptId,
+    //         deptName: that.sendDeptName,
+    //         eventStatus: eventStatus,
+    //         eventType: that.sendEventType,
+    //         id: that.eventId,
+    //         czlx: '',
+    //         cameraCode: that.cameraCode,
+    //         fireRadius: that.sendHuoZaiBanJing,
+    //         reserve: that.sendGuanLianYuAn
+    //       }
+    //       updateCentereventTEventcatalogueStatus(param).then(res => {
+    //         if (res.code == 200) {
+    //           that.$message.success(`处理成功!`)
+    //           that.refreshEvent(that.eventCode)
+    //           that.cancelEventConfirm_send()
+    //           that.showEventConfirm = false
+    //           that.$emit('getEventList', that.calendarDay,10,1)
+    //           that.$emit('getSupermap', that.calendarDay)
+    //         }
+    //       })
+    //     }
+    //   }
+    // },
     filterNode(value, data) {
       //树搜索
       if (!value) return true
@@ -2089,8 +2310,8 @@ export default {
         }
         setTimeout(() => {
           that.$refs.supermapDialog1.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
-          that.$refs.supermapDialog.clearM(false)
-          that.$refs.supermapDialog.clearM(true)
+          that.$refs.supermapDialog1.clearM(false)
+          that.$refs.supermapDialog1.clearM(true)
           that.$refs.supermapDialog1.setMarkersRadius([markersMap])
           that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
         }, 2000)
@@ -2120,8 +2341,8 @@ export default {
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
           setTimeout(() => {
-            that.$refs.supermapDialog.clearM(false)
-            that.$refs.supermapDialog.clearM(true)
+            that.$refs.supermapDialog1.clearM(false)
+            that.$refs.supermapDialog1.clearM(true)
             that.$refs.supermapDialog1.setMarkers([markersMap])
 
           }, 2000)
@@ -2184,8 +2405,8 @@ export default {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
         setTimeout(() => {
-          that.$refs.supermapDialog.clearM(false)
-          that.$refs.supermapDialog.clearM(true)
+          that.$refs.supermapDialog1.clearM(false)
+          that.$refs.supermapDialog1.clearM(true)
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
             that.$refs.supermapDialog1.setMarkersRadius([markersMap])
           } else {
@@ -2218,8 +2439,8 @@ export default {
           markersMap.lng = res.data.centermonitorTCamera.longitude
           markersMap.lat = res.data.centermonitorTCamera.latitude
           setTimeout(() => {
-            that.$refs.supermapDialog.clearM(false)
-            that.$refs.supermapDialog.clearM(true)
+            that.$refs.supermapDialog1.clearM(false)
+            that.$refs.supermapDialog1.clearM(true)
             that.$refs.supermapDialog1.setMarkers([markersMap])
           }, 2000)
         }