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

src/api/emergencyCommandMap/JointDuty.ts

@@ -111,3 +111,11 @@ export function deleteTask(data) {
     data: data
   });
 }
+// 获取事件简报列表
+export function getEventBriefingList(params) {
+  return request({
+    url: '/api/event_management/event_xp/event_briefing/list',
+    method: 'get',
+    params: params
+  });
+}

src/types/components.d.ts

@@ -21,7 +21,6 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -38,34 +37,22 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -76,7 +63,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
@@ -111,10 +97,6 @@ declare module 'vue' {
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     VideoTagEdit: typeof import('./../components/VideoTagEdit/index.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
-    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

src/views/emergencyCommandMap/RightSection/RightTop.vue

@@ -32,6 +32,8 @@
                 -->
               </div>
               <div class="box-content">{{ notification.content }}</div>
+              <div class="box-content">赶赴现场人员：{{ notification.name1 }}</div>
+              <div class="box-content">指挥部值守人员：{{ notification.name2 }}</div>
               <div v-if="!!notification.comment" class="box-content2">领导批示：{{ notification.comment }}</div>
             </div>
           </div>

src/views/emergencyCommandMap/RightSection/ShiJianJieBao.vue

@@ -24,7 +24,7 @@
 
 <script lang="ts" setup>
 import { onMounted, ref, reactive } from 'vue';
-import { selectTask } from '@/api/emergencyCommandMap/JointDuty';
+import { getEventBriefingList } from '@/api/emergencyCommandMap/JointDuty';
 import { parseTime } from '@/utils/ruoyi';
 import ShiJianJieBaoInfo from '@/views/emergencyCommandMap/RightSection/ShiJianJieBaoInfo.vue';
 
@@ -49,7 +49,7 @@ const showMoreEventManageList = () => {
 const fetchData = async () => {
   try {
     console.log('请求任务数据:', props.eventId);
-    const res = await selectTask({ event_code: props.eventId });
+    const res = await getEventBriefingList({ event_id: props.eventId });
     res.data.forEach((item) => {
       item.update_time = parseTime(item.update_time);
     });

src/views/emergencyCommandMap/RightSection/ShiJianJieBaoInfo.vue

@@ -32,7 +32,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive } from 'vue';
-import { selectTask } from '@/api/emergencyCommandMap/JointDuty';
+import { getEventBriefingList, selectTask } from '@/api/emergencyCommandMap/JointDuty';
 
 const taskList = ref([]);
 const total = ref(0);
@@ -40,17 +40,17 @@ const queryParams = reactive({
   page: 1,
   page_size: 10,
   task_id: '',
-  event_code: '',
+  event_id: '',
   sortBy: '',
   sortOrder: ''
 });
 
 const getList = () => {
   if (props.eventId) {
-    queryParams.event_code = props.eventId; // 使用 eventId
+    queryParams.event_id = props.eventId; // 使用 eventId
   }
 
-  selectTask(queryParams).then((res) => {
+  getEventBriefingList(queryParams).then((res) => {
     if (res.code === 200) {
       taskList.value = res.data;
       total.value = res.total;