事件详情

src/api/forest.js

@@ -380,6 +380,22 @@ export function uploadBase64(param) {
     data:param
   })
 }
+// 事件详情截图直接上传日志
+export function uploadBase64_direct(param) {
+  param.originalfilename='环保截图上传.png'
+  return request({
+    url: '/sooka-middlevisualization/visuMiddleVisualizationController/uploadBase64',
+    method: 'post',
+    data:param
+  })
+}
+export function updateCentereventTEventcatalogueStatus_direct(param) {
+  return request({
+    url: '/center-event/eventcatalogue/editEventStatus',
+    method: 'post',
+    data: param
+  })
+}
 export function centereventtdepteventList_direct(param) {
   return request({
     url: `/center-event/centereventtdeptevent/getAllCentereventDeptEvent?eventCode=${param.eventCode}`,

src/views/eventdetailsdialog.vue

@@ -2085,7 +2085,12 @@ import {
   getEventDetail_direct,
   dutysystemAdd_direct,
   dutysystemList_direct,
-  centereventtdepteventList_direct, listYuAn_direct, updateYjYuAn_direct, listSJfl_direct, selectByeventCode_direct
+  centereventtdepteventList_direct,
+  listYuAn_direct,
+  updateYjYuAn_direct,
+  listSJfl_direct,
+  selectByeventCode_direct,
+  uploadBase64_direct, updateCentereventTEventcatalogueStatus_direct, sendTask_direct
 } from "@/api/forest";
 import { joinConferences } from "@/api/meeting";
 import { treeselectAll as deptTreeselect } from "@/api/system/dept";
@@ -2095,6 +2100,7 @@ import { getDahuaVideoServer } from "@/api/dahua/dahua";
 import DHWs from "@/dahua/lib/DHWs";
 import { selectConfigKey } from "@/api/system/config";
 import Cookies from "js-cookie";
+import request from "@/utils/request";
 export default {
   dicts: ["task_source"],
   watch: {
@@ -2910,7 +2916,11 @@ export default {
           type: type,
           radius: this.radius,
         };
-        listResourceByWz(param).then((res) => {
+        // listResourceByWz(param).then((res) => {
+        request({
+          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
+          method: 'get'
+        }).then((res) => {
           if (res.data != null && res.data.length > 0) {
             this.resourcesListCheck.push(type);
             var markersList = [];
@@ -3377,7 +3387,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);
@@ -3442,7 +3452,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);
@@ -3568,13 +3578,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();
@@ -3935,7 +3949,7 @@ export default {
     },
     uploadBase64(dataBase64) {
       //事件详情截图直接上传日志
-      uploadBase64({
+      uploadBase64_direct({
         eventCode: this.eventCode,
         base64: dataBase64,
       }).then((res) => {

src/views/firespread.vue

@@ -1120,7 +1120,12 @@ import {
   dutysystemRemove_direct,
   dutysystemAdd_direct,
   dutysystemList_direct,
-  centereventtdepteventList_direct, listYuAn_direct, updateYjYuAn_direct, getEventDetail_direct
+  centereventtdepteventList_direct,
+  listYuAn_direct,
+  updateYjYuAn_direct,
+  getEventDetail_direct,
+  sendTask_direct,
+  updateCentereventTEventcatalogueStatus_direct, listSJfl_direct, selectByeventCode_direct, eventHandling_direct
 } from '@/api/forest'
 import {
   treeselectAll as deptTreeselect
@@ -1142,6 +1147,8 @@ import {
 } from "@/api/meeting";
 import findUserByDept from '@/views/findUserByDept'
 import Cookies from "js-cookie"; //责任人选择弹框
+import request from "@/utils/request";
+
 export default {
   dicts: ['task_source'],
   watch: {
@@ -1918,7 +1925,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 {
@@ -1952,7 +1959,10 @@ export default {
           type: type,
           radius: that.radius
         }
-        listResourceByWz(param).then(res => {
+        request({
+          url: `/center-monitor/camera/findNearbyCameras/${param.longitude}/${param.latitude}/${param.radius}`,
+          method: 'get'
+        }).then((res) => {
           if (res.data != null && res.data.length > 0) {
             that.resourcesListCheck.push(type)
             var markersList = []
@@ -2282,7 +2292,7 @@ export default {
           if (that.eventTypeXl != null) {
             that.sendEventType = that.eventTypeXl;
           } else {
-            await listSJfl(param).then((res) => {
+            await listSJfl_direct(param).then((res) => {
               //事件类型
               if (res.code == 200) {
                 that.eventTypeList = res.data;
@@ -2295,7 +2305,7 @@ export default {
               that.guanLianYuAnList = res.data;
             }
           });
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -2309,7 +2319,7 @@ export default {
         } else if (eventStatus == "wb") {
           //误报
           that.eventConfirmTitle = "事件误报";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -2320,7 +2330,7 @@ export default {
         } else if (eventStatus == "cf") {
           //重复
           that.eventConfirmTitle = "事件重复";
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -2330,7 +2340,7 @@ export default {
           that.showEventConfirm = true;
         } else if (eventStatus == "ld") {
           //联动
-          await selectByeventCode(that.eventCode).then((res) => {
+          await selectByeventCode_direct(that.eventCode).then((res) => {
             //签收部门
             if (res.code == 200) {
               that.deptOptions = res.data;
@@ -2388,7 +2398,7 @@ export default {
           //   return
           // }
           let eventState = "";
-          listSJfl({
+          listSJfl_direct({
             parentId: that.eventType,
           }).then((res) => {
             if (res.code == 200) {
@@ -2411,7 +2421,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);
@@ -2476,7 +2486,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);
@@ -2564,7 +2574,7 @@ export default {
             that.eventDescription = "";
           });
         } else if (eventStatus == "cz") {
-          eventHandling(that.eventId, that.eventCode).then((res) => {
+          eventHandling_direct(that.eventId, that.eventCode).then((res) => {
             if (res.code == 200) {
               that.$message.success(`处理成功!`);
               that.refreshEvent(that.eventCode);
@@ -2602,13 +2612,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();