Merge branch 'visu_environment_01_siping_2.5d' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization into visu_environment_01_siping_2.5d

src/views/eventdetailsdialog.vue

@@ -158,7 +158,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f" >
+                  <dv-border-box-7 backgroundColor="#040b1f"  >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -1420,6 +1420,7 @@ export default {
     addLine: function() {//添加负责人行数
       var newValue = {
         id: '',//主键
+        userId: '',//用户主键
         dept: '',//部门名称
         depteventId: '',//事件部门关联责任人
         name: '',//姓名
@@ -1470,17 +1471,9 @@ export default {
       dutysystemList(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
+        }else {
+          this.dutysystemTableData = []
         }
-        // else {
-        //   this.dutysystemTableData = [{
-        //     id: '',//主键
-        //     dept: this.dutysystemDeptName,//部门名称
-        //     depteventId: this.depteventId,//事件部门关联责任人
-        //     name: '',//姓名
-        //     post: '',//岗位
-        //     telphone: ''//手机号
-        //   }]
-        // }
       })
     },
 
@@ -2397,7 +2390,7 @@ console.log(this.dutysystemTableData)
       })
     },
     refreshEventDialog(eventCode) {
-      //刷新--事件日志
+      //刷新--事件日志12
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案

src/views/findUserByDept.vue

@@ -95,8 +95,8 @@
         this.resUser = [];
         for (let i in selection){
           const res = {};
-          res.id = selection[i].userId;
-          res.userId=''
+          res.id = '';
+          res.userId = selection[i].userId;
           res.dept = '';
           res.depteventId = '';
           res.name = selection[i].nickName;

src/views/firespread.vue

@@ -138,7 +138,7 @@
                   </dv-border-box-7>
                 </div>
                 <div class="forthis2">
-                  <dv-border-box-7 backgroundColor="#040b1f"  >
+                  <dv-border-box-7 backgroundColor="#040b1f" :color="['#0c4b53', '#18caca']" >
                     <div class="i-list-con">
                       <div class="this-con h-25 no-padding">
                         <div class="z-info-list" style="margin-top: 0;">
@@ -2079,6 +2079,7 @@ export default {
     addLine: function() {//添加负责人行数
       var newValue = {
         id: '',//主键
+        userId: '',//用户主键
         dept: '',//部门名称
         depteventId: '',//事件部门关联责任人
         name: '',//姓名
@@ -2095,7 +2096,6 @@ export default {
       getNewDataByDate(eventCode).then(function(res){
         that.windDirection=res.data.windDirection
         that.windSpeed=res.data.windSpeed
-
         setTimeout(() => {
           that.showheatPlotting()
         }, 2000)
@@ -2287,17 +2287,9 @@ export default {
       dutysystemList(param).then(res => {
         if (res.data != null && res.data.length > 0) {
           this.dutysystemTableData = res.data
+        }else {
+          this.dutysystemTableData = []
         }
-        // else {
-        //   this.dutysystemTableData = [{
-        //     id: '',//主键
-        //     dept: this.dutysystemDeptName,//部门名称
-        //     depteventId: this.depteventId,//事件部门关联责任人
-        //     name: '',//姓名
-        //     post: '',//岗位
-        //     telphone: ''//手机号
-        //   }]
-        // }
       })
     },
 
@@ -2951,7 +2943,6 @@ export default {
           markersMapList.push(markersMap)
         }
         setTimeout(() => {
-          that.$refs.supermapDialog1.dynamicPlotting()//弹出动态绘制窗口，防止截图位置改变
           that.$refs.supermapDialog1.dropLocation10(res.data.catalogue.latitude, res.data.catalogue.longitude)
           that.$refs.supermapDialog1.clearM(false)
           that.$refs.supermapDialog1.clearM(true)
@@ -3047,7 +3038,7 @@ export default {
       })
     },
     refreshEventDialog(eventCode) {
-      //刷新--事件日志
+      //刷新--事件日志12
       getEventDetail({ eventCode: eventCode }).then(res => {
         this.eventLogList = res.data.eventlog
         this.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案

src/views/forest.vue

@@ -509,6 +509,7 @@
         forestInfo: '', //基本情况
         //左侧获取事件信息统计
         totalStr: '000000',
+        totalAllEvent: 0,
         aiTotal: '',
         newReport: '',
         otherTotal: '',
@@ -860,6 +861,7 @@
           this.readySure = res.data.readySure
           this.readySure_pre = res.data.readySure_pre
           this.totalStr = res.data.totalStr
+          this.totalAllEvent = +res.data.totalStr
           this.total = res.data.total
           this.eventChartAi(this.aiTotal_pre, this.otherTotal_pre)
         })
@@ -991,8 +993,7 @@
           this.$modal.msg('当前已是第一页')
 
           return;
-        }
-        else if(pageNum>num)
+        }else if(pageNum>this.totalAllEvent/10+1)
         {
           this.$modal.msg('当前已是最后一页')
           return;