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

src/views/datacenter.vue

@@ -234,7 +234,8 @@ export default {
         },
         dataZoom: [
           {
-            show: true,
+            show: this.source.length > 8 ? true : false,
+            // show: true,
             type: "slider",
             yAxisIndex: 0,
             left: 0,

src/views/eventLogUpload.vue

@@ -22,7 +22,7 @@
         <div class="el-upload__tip" slot="tip" v-if="showTip">
           请上传
           <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
-<!--          <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b></template>-->
+          <!--          <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b></template>-->
           的文件
         </div>
       </el-upload>
@@ -123,22 +123,29 @@ export default {
   methods: {
     submitUpload() {
       let fileUrl=[]
-      if(this.fileList!=null&&this.fileList.length>0){
-        for (let i = 0; i < this.fileList.length; i++) {
-          let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx: "bus_indx_forest",busSource: "PC"}
-          fileUrl.push(file)
+      if (this.fileList!=null&&this.fileList.length>0)
+      {
+        if(this.fileList!=null&&this.fileList.length>0){
+          for (let i = 0; i < this.fileList.length; i++) {
+            let file={attachPath:this.fileList[i].url,fileName:this.fileList[i].webName,busIndx:  "bus_indx_forest",busSource: "PC"}
+            fileUrl.push(file)
+          }
         }
+        let param={ eventCode:this.eventCode,operation:"bus_oper_type_2",operationType:"log_oper_type_1",fileList: fileUrl }
+        //日志文件上传
+        eventLogUpload(param).then(res => {
+          if(res.code==200){
+            this.$message.success(`上传成功!`);
+            this.showEventLogUpload = false
+            this.cancelEventLogUploadShow();
+            this.$parent.refreshEventDialog(this.eventCode)
+          }
+        })
+      }else {
+        this.$message.warning(`请先上传文件!`);
       }
-      let param={ eventCode:this.eventCode,operation:"bus_oper_type_2",operationType:"log_oper_type_1",fileList: fileUrl }
-      //日志文件上传
-      eventLogUpload(param).then(res => {
-        if(res.code==200){
-          this.$message.success(`上传成功!`);
-          this.showEventLogUpload = false
-          this.cancelEventLogUploadShow();
-          this.$parent.refreshEventDialog(this.eventCode)
-        }
-      })
+
+
     },
     eventLogUpload(eventCode) {
       this.eventCode=eventCode

src/views/firespread.vue

@@ -2342,21 +2342,19 @@ findUserByDept
     showheatPlotting() {
       this.$refs.supermapDialog1.showheatPlotting(this.latitude, this.longitude,this.windSpeed,this.windDirection)
     },
-    showUpdateYjYuAn() {
-      listYuAn().then(res => {
-        //关联预案列表
-        if (res.code == 200) {
-          this.guanLianYuAnList = res.data
-          this.showGuanLianYuAnConfirm = true
-        }
-      })
-    },
     updateYjYuAn() {
-      if(this.eventStatusValue=='forest_event_status_1'){
+      if(this.eventStatusValue=='forest_event_status_1'||this.eventStatusValue=='forest_event_status_7') {
         this.$message.error(`修改预案信息在签收后方可修改！`)
         return
+      }else if(this.eventStatusValue=='forest_event_status_3'){
+        this.$message.error(`误报事件无法修改预案信息！`)
+        return
       }else{
         let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
+        if(this.sendGuanLianYuAn==''||this.sendGuanLianYuAn==null){
+          this.$message.error(`请选择预案信息！`)
+          return
+        }
         updateYjYuAn(param).then(res => {
           //事件调整关联预案
           if (res.code == 200) {
@@ -2368,6 +2366,32 @@ findUserByDept
         })
       }
     },
+    showUpdateYjYuAn() {
+      listYuAn().then(res => {
+        //关联预案列表
+        if (res.code == 200) {
+          this.guanLianYuAnList = res.data
+          this.showGuanLianYuAnConfirm = true
+        }
+      })
+    },
+    // updateYjYuAn() {
+    //   if(this.eventStatusValue=='forest_event_status_1'){
+    //     this.$message.error(`修改预案信息在签收后方可修改！`)
+    //     return
+    //   }else{
+    //     let param = { eventCode: this.eventCode, reserve: this.sendGuanLianYuAn }
+    //     updateYjYuAn(param).then(res => {
+    //       //事件调整关联预案
+    //       if (res.code == 200) {
+    //         this.$message.success(`预案调整成功!`)
+    //         this.refreshEventDialog(this.eventCode)
+    //         this.sendGuanLianYuAn = null
+    //         this.showGuanLianYuAnConfirm = false
+    //       }
+    //     })
+    //   }
+    // },
     listResourceByWz(type) {
       if (this.resourcesListCheck.indexOf(type) > -1) {
         this.resourcesListCheck.splice(this.resourcesListCheck.indexOf(type), 1)