Merge remote-tracking branch 'origin/visu_emergency_01_siping_2.5d' into visu_emergency_01_siping_2.5d

src/views/bigdata/bigdata.vue

@@ -39,7 +39,7 @@
           </div>
           <chartEquipmentType></chartEquipmentType>
         </div>
-        
+
       </div>
       <!-- 第二纵向-->
       <div class="bigdata-list wid-li-2 m-l-15">
@@ -89,9 +89,9 @@
       <div class="bigdata-list wid-li-3 m-l-15 flex-r">
         <div class="b-con mg-b-20 taller">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">
-            <span>企业分布情况</span>
+<!--            <span>企业分布情况</span>-->
           </div>
-          <chartGridDistribution></chartGridDistribution>
+<!--          <chartGridDistribution></chartGridDistribution>-->
         </div>
         <!-- <div class="b-con">
           <div class="b-tit"><img src="@/assets/images/integrated/bigdata-tit-icon.png">

src/views/bigdata/chart-gridStaff.vue

@@ -73,7 +73,7 @@
         //   });
         // }
 
-        var max = getMax(arr, 'amount'),
+        var max = getMax(arr, 'value'),
           angleAxisData = getValArr(arr, 'name');
         $.each(arr, function(i, e) {
           e.value = (e.amount / max * 100).toFixed(2);

src/views/eventdetailsdialog.vue

@@ -2083,7 +2083,7 @@ console.log(this.dutysystemTableData)
           })
 
         } else if (eventStatus == 'gd') {
-          if(that.eventType == 1){
+          if(that.eventTypeXl == 101){
             let double = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/;    //数字和两位小数
             let number = /^[+]{0,1}(\d+)$/g;    //正整数
 
@@ -2406,7 +2406,9 @@ console.log(this.dutysystemTableData)
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById('forestWarmSuperMap')
       let toolbar = document.getElementById('toolbar')
-      canvasBox.removeChild(toolbar)
+      if(toolbar!=null){
+        canvasBox.removeChild(toolbar)
+      }
       // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width)
       const height = parseInt(window.getComputedStyle(canvasBox).height)

src/views/firespread.vue

@@ -2744,30 +2744,31 @@ export default {
           })
 
         } 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(that.eventTypeXl == 101) {
+            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
+            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,
@@ -3056,8 +3057,9 @@ export default {
       // let canvasBox = this.$refs.imageTofile
       let canvasBox = document.getElementById('forestWarmSuperMap')
       let toolbar = document.getElementById('toolbar')
-      canvasBox.removeChild(toolbar)
-      // 获取父级的宽高
+      if(toolbar!=null){
+        canvasBox.removeChild(toolbar)
+      }      // 获取父级的宽高
       const width = parseInt(window.getComputedStyle(canvasBox).width)
       const height = parseInt(window.getComputedStyle(canvasBox).height)
 

src/views/forest.vue

@@ -1033,7 +1033,11 @@ export default {
     },
     getWebSocketEvent(data) {
       let that = this
-      const event = data
+      // const event = JSON.parse(data);
+      let event = data
+      if (typeof data != 'object') {
+        event = JSON.parse(data);
+      }
       //右侧获取事件列表
       that.markersList = []
       let markersMap = {

src/views/monitor.vue

@@ -376,21 +376,24 @@
         }
       },
       sheClick() {
-        this.onLa = false
-        this.onShe = true
-        this.onChuan = false
-        this.localMark = 'she'
-        this.placeholderMsg = "请输入摄像头名称"
-        this.selectDeviceType()
+        this.onLa = false;
+        this.onShe = true;
+        this.onChuan = false;
+        this.localMark = "she";
+        this.placeholderMsg = "请输入摄像头名称";
+        this.deptId = Cookies.get("deptId");
+        clearInterval(this.cgqTimer);
+        this.selectDeviceType();
       },
       laClick() {
-        this.onLa = true
-        this.onShe = false
-        this.onChuan = false
-        this.localMark = 'la'
-        this.placeholderMsg = "请输入云广播名称"
-        this.deptId = Cookies.get("deptId")
-        this.getDlblistBydeptId()
+        this.onLa = true;
+        this.onShe = false;
+        this.onChuan = false;
+        this.localMark = "la";
+        this.placeholderMsg = "请输入云广播名称";
+        this.deptId = Cookies.get("deptId");
+        clearInterval(this.cgqTimer);
+        this.getDlblistBydeptId();
       },
       chuanClick() {
         this.onLa = false
@@ -399,9 +402,7 @@
         this.localMark = 'chuan'
         this.placeholderMsg = "请输入传感器名称"
         this.deptId = Cookies.get("deptId")
-        //this.getSensorListByDeptId()
         this.getMonitorDeviceAndDataList()
-
       },
       // 云广播
       getDlblistBydeptId() {