事件详情

src/api/forest.js

@@ -265,6 +265,14 @@ export function updateCentereventTEventcatalogueStatus(param) {
     data: param
   })
 }
+
+export function updateCentereventTEventcatalogueStatus_direct(param) {
+  return request({
+    url: '/center-event/eventcatalogue/editEventStatus',
+    method: 'post',
+    data: param
+  })
+}
 // 事件处理流程-事件类型
 export function listSJfl(param) {
   return request({
@@ -393,7 +401,7 @@ export function dutysystemList(param) {
 export function dutysystemAdd(param) {
   return request({
     // url: '/center-resources/VisuForestCloudMapController/dutysystemAdd',
-    url: '/center-event//dutysystem/addOrUpdateAll',//无逻辑
+    url: '/center-event/dutysystem/addOrUpdateAll',//无逻辑
     method: 'post',
     data:param
   })

src/views/eventdetailsdialog.vue

@@ -2042,7 +2042,7 @@ import {
   userFeginlist,
   eventExamine,
   eventHandling,
-  initByCameras, uploadBase64_direct,
+  initByCameras, uploadBase64_direct, sendTask_direct, updateCentereventTEventcatalogueStatus_direct,
 } from "@/api/forest";
 import { joinConferences } from "@/api/meeting";
 import { treeselectAll as deptTreeselect } from "@/api/system/dept";
@@ -2343,7 +2343,6 @@ export default {
     },
     // 获取消防左侧菜单列表
     fireControlViewList() {
-      console.log(11111)
       this.resourcesList = [];
       let _this = this;
       fireControlViewList("xiaofang").then(function (res) {
@@ -2648,7 +2647,7 @@ export default {
       this.$refs.bottomMenu.showChangChild = false
     },
     showUpdateYjYuAn() {
-      listYuAn().then((res) => {
+      listYuAn({}).then((res) => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data;
@@ -3334,7 +3333,7 @@ export default {
                 eventState: eventState,
                 eventName: that.eventName,
               };
-              sendTask(param).then((res) => {
+              sendTask_direct(param).then((res) => {
                 if (res.code == 200) {
                   that.$message.success(`联动发起成功!`);
                   that.refreshEventDialog(that.eventCode);
@@ -3399,7 +3398,7 @@ export default {
             },
             array: that.regionalFlagObj.array,
           };
-          updateCentereventTEventcatalogueStatus(param).then((res) => {
+          updateCentereventTEventcatalogueStatus_direct(param).then((res) => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`);
               that.refreshEvent(that.eventCode);
@@ -3525,13 +3524,17 @@ export default {
             eventType: that.sendEventType,
             id: that.eventId,
             czlx: "",
+            message: "",
             version: that.version,
             cameraCode: that.cameraCode,
             fireRadius: that.sendHuoZaiBanJing,
             reserve: that.sendGuanLianYuAn,
             address: that.address,
           };
-          updateCentereventTEventcatalogueStatus(param).then((res) => {
+          if(param.phones.length==0){
+            param.message='有火险事件需要处理请查收'
+          }
+          updateCentereventTEventcatalogueStatus_direct(param).then((res) => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`);
               that.cancelEventConfirm_send();
@@ -3984,8 +3987,8 @@ export default {
     },
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志
-      // uploadBase64_direct({
-      uploadBase64({
+      uploadBase64_direct({
+      // uploadBase64({
         eventCode: this.eventCode,
         base64: dataBase64,
       }).then((res) => {

src/views/firespread.vue

@@ -1121,7 +1121,7 @@ import {
   fireControlViewList,
   sendMessage,
   fireControlViewPoint,
-  fireControlViewPoint_ygb, uploadBase64_direct
+  fireControlViewPoint_ygb, uploadBase64_direct, sendTask_direct, updateCentereventTEventcatalogueStatus_direct
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1910,7 +1910,7 @@ export default {
       this.$refs.supermapDialog1.showheatPlotting(this.latitude, this.longitude, this.windSpeed, this.windDirection)
     },
     showUpdateYjYuAn() {
-      listYuAn().then(res => {
+      listYuAn({}).then(res => {
         //关联预案列表
         if (res.code == 200) {
           this.guanLianYuAnList = res.data
@@ -1919,7 +1919,7 @@ export default {
       })
     },
     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 {
@@ -2398,8 +2398,7 @@ export default {
                 eventState: eventState,
                 eventName: that.eventName
               }
-              debugger
-              sendTask(param).then(res => {
+              sendTask_direct(param).then(res => {
                 if (res.code == 200) {
                   that.$message.success(`联动发起成功!`)
                   that.refreshEventDialog(that.eventCode)
@@ -2454,7 +2453,7 @@ export default {
             },
             array: that.regionalFlagObj.array
           }
-          updateCentereventTEventcatalogueStatus(param).then(res => {
+          updateCentereventTEventcatalogueStatus_direct(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.refreshEvent(that.eventCode)
@@ -2583,12 +2582,16 @@ export default {
             id: that.eventId,
             version: that.version,
             czlx: '',
+            message: '',
             cameraCode: that.cameraCode,
             fireRadius: that.sendHuoZaiBanJing,
             reserve: that.sendGuanLianYuAn,
             address: that.address,
           }
-          updateCentereventTEventcatalogueStatus(param).then(res => {
+          if(param.phones.length==0){
+            param.message='有火险事件需要处理请查收'
+          }
+          updateCentereventTEventcatalogueStatus_direct(param).then(res => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`)
               that.cancelEventConfirm_send()
@@ -3008,7 +3011,7 @@ export default {
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志
       // uploadBase64_direct({
-      uploadBase64({
+      uploadBase64_direct({
         eventCode: this.eventCode,
         base64: dataBase64
       }).then(res => {