Merge remote-tracking branch 'origin/main' into main

cjy-project/src/main/java/com/cjy/patrol/service/impl/PatrolRecordServiceImpl.java

@@ -250,16 +250,16 @@ public class PatrolRecordServiceImpl implements IPatrolRecordService {
 				patrolTaskMonitor.setTaskFinishState("2");
             //如果让修改任务为已完成则放开注释 然后修改对应的taskSatte
 //                PatrolTask patrolTask = new PatrolTask();
-//                patrolTask.setId(Long.parseLong(patrolCheckDTO.getTaskId()));
-//                patrolTask.setTaskState("2");
+
 //                patrolTaskMapper.updatePatrolTask(patrolTask);
 			}
 			String formatted = df.format(completeness);
 			patrolTaskMonitor.setCompleteness( formatted+ "%");
-
+			patrolTaskMonitor.setPatrolmanId(patrolCheckDTO.getUserId());
 			patrolTaskMonitor.setPatrolDate(patrolCheckDTO.getPatrolDate());
+			patrolTaskMonitor.setId(Long.parseLong(patrolCheckDTO.getTaskId()));
 
-
+			patrolTaskMonitor.setPatrolTaskId(Long.parseLong(patrolCheckDTO.getTaskId()));
 			patrolTaskMonitorMapper.updatePatrolTaskMonitor(patrolTaskMonitor);
 		}
 		//修改任务的开始状态

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)
 
     //获取 告警数统计 数据

ruoyi-ui/src/views/system/management/emergency-command/info/index.vue

@@ -658,6 +658,13 @@
                   <el-form-item label="标题" prop="title">
                     {{ form.title || '/' }}
                   </el-form-item>
+                  <el-form-item label="标题" prop="title">
+                    <el-image v-for="item in form.pictureUrlList"
+                      style="width: 100px; height: 100px"
+                      :src="baseUrl+item"
+                      :preview-src-list="form.pictureUrlList">
+                    </el-image>
+                  </el-form-item>
                   <el-form-item label="描述" prop="description">
                     {{ form.description || '/' }}
                   </el-form-item>
@@ -986,13 +993,14 @@ import {
 import infoConfig from "@/views/system/management/emergency-command/utils/infoConfig";
 import {deptTreeSelect} from "@/api/system/user";
 import NewMap from "@/components/CommonComponents/PublicCoponents/map/NewMap";
-
+import elImageViewer from "element-ui/packages/image/src/image-viewer"
 export default {
-  components: {NewMap},
+  components: {NewMap,elImageViewer},
   mixins: [infoConfig],
   name: "Info",
   data() {
     return {
+      baseUrl: process.env.VUE_APP_BASE_API,
       obj: {},
       isEdit: false,
       handleNameList: null,