临时事件调整

src/types/components.d.ts

@@ -45,6 +45,7 @@ declare module 'vue' {
     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']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -53,6 +54,8 @@ declare module 'vue' {
     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']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

src/views/routineCommandMap/PositionMap.vue

@@ -1,7 +1,28 @@
 <template>
-  <Dialog type="md" title="请选择事发地点" height="780px" customShow @close="handleClose" @confirm="submit">
+  <Dialog type="md" title="请选择事发地点" draggable height="780px" customShow @close="handleClose" @confirm="submit">
     <el-form ref="queryFormRef" :model="form" :rules="rules">
       <div class="form">
+        <div class="line">
+          <div class="form-item" style="margin-right: 20px">
+            <div class="text">灾害事件</div>
+            <el-input v-model="form.event_title" class="custom-input" placeholder="请输入" />
+          </div>
+        </div>
+        <div class="line">
+          <div class="form-item" style="margin-right: 20px">
+            <div class="text">灾害级别</div>
+            <el-select
+              v-model="form.event_level"
+              placeholder="请选择"
+              class="custom-select"
+              popper-class="custom-select-popper"
+              :teleported="false"
+              clearable
+            >
+              <el-option v-for="item in mm_event_level" :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </div>
+        </div>
         <div class="line">
           <div class="form-item" style="margin-right: 10px">
             <div class="text">详细地址</div>
@@ -47,11 +68,11 @@
         </div>
         <div class="line">
           <div class="form-item">
-            <div class="text">经度</div>
+            <div class="text" style="width: 72px; text-align: right">经度</div>
             <el-input v-model="form.longitude" class="custom-input" placeholder="请输入" />
           </div>
-          <div class="form-item" style="margin-left: 80px">
-            <div class="text">详细地址</div>
+          <div class="form-item">
+            <div class="text" style="width: 72px; text-align: right">纬度</div>
             <el-input v-model="form.latitude" class="custom-input" placeholder="请输入" />
           </div>
         </div>
@@ -78,6 +99,8 @@ const props = defineProps({
     }
   }
 });
+const proxy = getCurrentInstance()?.proxy;
+const { mm_event_level } = toRefs(proxy?.useDict( 'mm_event_level'));
 const router = useRouter();
 const emits = defineEmits(['update:visible']);
 // 地图对象
@@ -86,11 +109,6 @@ let amap = {};
 let marker = null; //地图上的点标记
 let contextMenu = null;
 let lnglatPosition = ref([]); //选中的新坐标
-let rules = reactive({
-  address: [{ required: true, message: '详细地址不能为空', trigger: 'blur' }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
-});
 let pageNum = ref(1);
 let pageSize = ref(10);
 let total = ref(0);
@@ -307,6 +325,22 @@ function handleResize() {
   map.resize();
 }
 function submit() {
+  if (!form.address) {
+    proxy('详细地址不能为空');
+  } else if (!form.longitude) {
+    showErrorMsg('经度不能为空');
+  } else if (!form.latitude) {
+    showErrorMsg('纬度不能为空');
+  } else {
+    addEvent(form).then((res) => {
+      router.push({
+        path: '/emergencyCommandMap',
+        query: {
+          event_id: res.data
+        }
+      });
+    });
+  }
   queryFormRef.value.validate((valid) => {
     if (valid) {
       console.log('提交数据', form);