no message

src/types/components.d.ts

@@ -29,9 +29,13 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
+    ElCollapse: typeof import('element-plus/es')['ElCollapse']
+    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
     ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
@@ -44,23 +48,31 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
+    ElMain: typeof import('element-plus/es')['ElMain']
     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']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
+    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     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']
+    ElSpace: typeof import('element-plus/es')['ElSpace']
+    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']
@@ -73,6 +85,7 @@ declare module 'vue' {
     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']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
@@ -84,6 +97,9 @@ 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']
+    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+    IEpCaretTop: typeof import('~icons/ep/caret-top')['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']

src/views/emergencyCommandMap/RightSection/RenWuGenZong.vue

@@ -119,7 +119,7 @@ const toggleScroll = () => {
 
 // 设置定时器
 const fetchInterval = process.env.NODE_ENV === 'development' ? 60000 : 3000; // 每60秒刷新一次(刷新太频繁影响调试)
-let intervalId: number | null = null;
+let intervalId: any | null = null;
 
 const startFetchingData = () => {
   if (!intervalId) {

src/views/emergencyCommandMap/RightSection/TaskDelivery.vue

@@ -28,9 +28,10 @@
       </el-skeleton>
     </div>
     <template #footer>
-      <div class="dialog-footer">
-        <div class="common-btn-primary2" @click="sendTasks" style="margin-right: 20px">确认发送H5短信</div>
-        <div class="common-btn" @click="closeDialog">取 消</div>
+      <div class="dialog-footer" style="margin-right:8px">
+        <div class="common-btn" @click="closeDialog" style="margin-right: 20px">取 消</div>
+        <div class="common-btn-primary2" @click="sendTasks">确认发送H5短信</div>
+        
       </div>
     </template>
   </Dialog>
@@ -60,7 +61,7 @@ watch(
   (newValue) => {
     dialogVisible.value = newValue;
     if (newValue && props.planId && props.eventId) {
-      fetchDataWithLoading(props.planId, props.eventId);
+      fetchDataWithLoading(/*props.planId, props.eventId*/);
     }
   }
 );
@@ -92,7 +93,15 @@ const sendTasks = () => {
     return;
   }
 
-  sendTask({ eventId: props.eventId })
+  // 领导批示内容
+  let task_list = {};
+  tasks.value.map((v)=>{
+    if(v.content2 && v.content2 != "") {
+      task_list[v.dept_id] =  v.content2
+    }
+  })
+  // console.log(tasks.value);
+  sendTask({ eventId: props.eventId, tasks: task_list })
     .then(() => {
       ElMessage.success('任务已成功发送！');
       closeDialog(); // 使用关闭方法
@@ -105,9 +114,12 @@ const handleShowApprove = (item) => {
   item.show = !!!item.show;
 };
 const handleCancel = (item) => {
+  item.content2 = "";
+  item.comment = "";
   item.show = false;
 };
 const handleSubmit = (item) => {
+  item.comment = item.content2;
   item.show = false;
 };
 </script>