Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/picture/alarm-desk/index.vue

@@ -364,7 +364,6 @@ export default {
     //初始化地图
     setTimeout(() => {
       this.initMap();
-      this.coverMap()
     }, 2500);
 
 

ruoyi-ui/src/views/picture/command-dispatch/index.vue

@@ -952,7 +952,6 @@ export default {
     //初始化地图
     setTimeout(() => {
       this.initMap()
-      this.coverMap()
     }, 2500)
 
     //获取 告警数统计 数据
@@ -1013,7 +1012,6 @@ export default {
     getResourcesID(code,index){
       this.ResourcesType=index
       this.ResourcesId=code
-      console.log('thisResourcesId',this.ResourcesId)
     },
     getLevelClass(value) {
       switch (value) {
@@ -1317,7 +1315,6 @@ export default {
     getTreeLists(val) {
       getTreeList(val).then(response => {
         this.groupDatas = response.data
-        console.log('this.groupDatas',this.groupDatas)
       })
     },
     //获取应急预案及应急资源列表
@@ -1346,12 +1343,10 @@ export default {
     },
     getValue(tabType, type) {
       this.EmergencyOneId=type
-      console.log('this.EmergencyOneId',this.EmergencyOneId)
       this.getPlanEmergency(tabType, type)
     },
     getValuep(tabType, type) {
       this.ResourcesOneId=type
-      console.log('this.ResourcesOneId',this.ResourcesOneId)
       this.getPlanEmergency(tabType, type)
     },
     //物资清单详情
@@ -1422,6 +1417,16 @@ export default {
       this.dispatchForm.id = this.rowId
       if (val == 3) {
         this.dispatchForm.status = val
+        let params = {
+          id: this.rowId,
+          status: val,
+          emergencyPlanOneId:this.EmergencyOneId,
+          emergencyPlanId:this.EmergencyID,
+          emergencyResourcesOneId:this.ResourcesOneId,
+          emergencyResourcesId:this.ResourcesId,
+        }
+
+        Object.assign(this.dispatchForm, params);
         handleAlarmInfo(this.dispatchForm).then(response => {
           if(type=='chujing'){
             this.$message.success('处警成功')