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

src/types/auto-imports.d.ts

@@ -312,10 +312,6 @@ declare module 'vue' {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
-    readonly ElLoading: UnwrapRef<typeof import('element-plus/es')['ElLoading']>
-    readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
-    readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
-    readonly ElNotification: UnwrapRef<typeof import('element-plus/es')['ElNotification']>
     readonly acceptHMRUpdate: UnwrapRef<typeof import('pinia')['acceptHMRUpdate']>
     readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>
     readonly autoResetRef: UnwrapRef<typeof import('@vueuse/core')['autoResetRef']>

src/views/censusDataAnalysis/MeteorologicalCalamity/data.ts

@@ -62,11 +62,6 @@ export const iconList = {
     imageHover: getImageUrl('surfacecollapse'),
     size: [43, 44]
   },
-  '13': {
-    image: getImageUrl('surfacesubsidence'),
-    imageHover: getImageUrl('surfacesubsidence'),
-    size: [43, 44]
-  },
   '13': {
     image: getImageUrl('surfacesubsidence'),
     imageHover: getImageUrl('surfacesubsidence'),

src/views/emergencyCommandMap/RightSection/RenWuDengJi.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog custom-show type="sm" title="任务下达" height="630px" @confirm="confirmRegister" @close="closeDialog">
+  <Dialog custom-show type="sm" title="任务下达" height="650px" @confirm="confirmRegister" @close="closeDialog">
     <div class="dialog-content">
       <div class="dialog-body">
         <el-form ref="taskFormRef" :model="form" :rules="rules">