修复bug

src/types/components.d.ts

@@ -24,24 +24,14 @@ declare module 'vue' {
     DistributionMap: typeof import('./../components/Map/YztMap/DistributionMap.vue')['default']
     DrawMap: typeof import('./../components/Map/YztMap/DrawMap.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxButton: typeof import('element-plus/es')['ElCheckboxButton']
-    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']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -51,45 +41,28 @@ 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']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
     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']
@@ -101,9 +74,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']
-    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/comprehensiveGuarantee/reliefResourceManagement/airRaidShelters.vue

@@ -21,24 +21,24 @@
         <el-table-column label="应建人防地下室面积（m³）" align="center" prop="yjdxsmj" width="150" />
         <el-table-column label="实建人防地下室面积（m³）" align="center" prop="sjdxsmj" width="150" />
         <el-table-column label="更新时间" align="center" prop="cd_time" width="150" />
-        <el-table-column label="新增时间" align="center" prop="add_time" width="150" />
-        <el-table-column label="监理单位" align="center" prop="jldw" width="150" />
-        <el-table-column label="建设单位统一社会信用代码" align="center" prop="jsdwdm" width="150" />
-        <el-table-column label="开工时间" align="center" prop="kgsj" width="150" />
-        <el-table-column label="审图单位" align="center" prop="stdw" width="150" />
-        <el-table-column label="批次号" align="center" prop="cd_batch" width="150" />
-        <el-table-column label="人防设计单位单位统一社会信用代码" align="center" prop="rfsjdwdm" width="150" />
-        <el-table-column label="人防设计单位" align="center" prop="rfsjdw" width="150" />
-        <el-table-column label="掩蔽人数" align="center" prop="ybrs" width="150" />
-        <el-table-column label="审图单位统一社会信用代码" align="center" prop="stdwdm" width="150" />
-        <el-table-column label="维护单位统一社会信用代码" align="center" prop="whdwdm"  width="150" />
-        <el-table-column label="监理单位统一社会信用代码" align="center" prop="jldwdm" width="150" />
-        <el-table-column label="人防总监理工程师" align="center" prop="rfzjlgcs" width="150" />
-        <el-table-column label="竣工时间" align="center" prop="jgsj" width="150" />
-        <el-table-column label="人防防护设备单位" align="center" prop="rffhsbdw" width="150" />
-        <el-table-column label="人防防护设备单位统一社会信用代码" align="center" prop="rffhsbdwdm" width="150" />
-        <el-table-column label="经度" align="center" prop="jingdu" width="150" />
-        <el-table-column label="纬度" align="center" prop="weidu" width="150" />
+<!--        <el-table-column label="新增时间" align="center" prop="add_time" width="150" />-->
+<!--        <el-table-column label="监理单位" align="center" prop="jldw" width="150" />-->
+<!--        <el-table-column label="建设单位统一社会信用代码" align="center" prop="jsdwdm" width="150" />-->
+<!--        <el-table-column label="开工时间" align="center" prop="kgsj" width="150" />-->
+<!--        <el-table-column label="审图单位" align="center" prop="stdw" width="150" />-->
+<!--        <el-table-column label="批次号" align="center" prop="cd_batch" width="150" />-->
+<!--        <el-table-column label="人防设计单位单位统一社会信用代码" align="center" prop="rfsjdwdm" width="150" />-->
+<!--        <el-table-column label="人防设计单位" align="center" prop="rfsjdw" width="150" />-->
+<!--        <el-table-column label="掩蔽人数" align="center" prop="ybrs" width="150" />-->
+<!--        <el-table-column label="审图单位统一社会信用代码" align="center" prop="stdwdm" width="150" />-->
+<!--        <el-table-column label="维护单位统一社会信用代码" align="center" prop="whdwdm"  width="150" />-->
+<!--        <el-table-column label="监理单位统一社会信用代码" align="center" prop="jldwdm" width="150" />-->
+<!--        <el-table-column label="人防总监理工程师" align="center" prop="rfzjlgcs" width="150" />-->
+<!--        <el-table-column label="竣工时间" align="center" prop="jgsj" width="150" />-->
+<!--        <el-table-column label="人防防护设备单位" align="center" prop="rffhsbdw" width="150" />-->
+<!--        <el-table-column label="人防防护设备单位统一社会信用代码" align="center" prop="rffhsbdwdm" width="150" />-->
+<!--        <el-table-column label="经度" align="center" prop="jingdu" width="150" />-->
+<!--        <el-table-column label="纬度" align="center" prop="weidu" width="150" />-->
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">
           <template #default="scope">
             <el-text class="common-btn-text-primary" @click="handleView(scope.row)">查看</el-text>

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersAdd.vue

@@ -41,10 +41,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="操作方式：" prop="cd_operation">
-                <el-input v-model="formData.cd_operation" placeholder="请输入操作方式" style="width: 468px !important" />
+              <el-form-item label="人防设计单位：" prop="rfsjdw">
+                <el-input v-model="formData.rfsjdw" placeholder="请输入人防设计单位" style="width: 468px !important" />
               </el-form-item>
             </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="操作方式：" prop="cd_operation">-->
+<!--                <el-input v-model="formData.cd_operation" placeholder="请输入操作方式" style="width: 468px !important" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
@@ -58,28 +63,28 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="更新时间：" prop="cd_time">
-                <el-date-picker
-                  v-model="formData.cd_time"
-                  type="datetime"
-                  placeholder="请选择时间"
-                  style="width: 468px !important"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="新增时间：" prop="add_time">
-                <el-date-picker
-                  v-model="formData.add_time"
-                  type="datetime"
-                  placeholder="请选择时间"
-                  style="width: 468px !important"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row :gutter="20" class="mb8">-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="更新时间：" prop="cd_time">-->
+<!--                <el-date-picker-->
+<!--                  v-model="formData.cd_time"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="请选择时间"-->
+<!--                  style="width: 468px !important"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="新增时间：" prop="add_time">-->
+<!--                <el-date-picker-->
+<!--                  v-model="formData.add_time"-->
+<!--                  type="datetime"-->
+<!--                  placeholder="请选择时间"-->
+<!--                  style="width: 468px !important"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="监理单位：" prop="jldw">
@@ -110,29 +115,23 @@
             </el-col>
           </el-row>
           <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="批次号：" prop="cd_batch">
-                <el-input v-model="formData.cd_batch" placeholder="请输入批次号" style="width: 468px !important" />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="批次号：" prop="cd_batch">-->
+<!--                <el-input v-model="formData.cd_batch" placeholder="请输入批次号" style="width: 468px !important" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="10">
               <el-form-item label="人防设计单位单位统一社会信用代码：" prop="rfsjdwdm">
                 <el-input v-model="formData.rfsjdwdm" placeholder="请输入人防设计单位单位统一社会信用代码" style="width: 468px !important" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="人防设计单位：" prop="rfsjdw">
-                <el-input v-model="formData.rfsjdw" placeholder="请输入人防设计单位" style="width: 468px !important" />
-              </el-form-item>
-            </el-col>
             <el-col :span="10">
               <el-form-item label="掩蔽人数：" prop="ybrs">
                 <el-input v-model="formData.ybrs" placeholder="请输入掩蔽人数" style="width: 468px !important" />
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="审图单位统一社会信用代码：" prop="stdwdm">
@@ -210,6 +209,7 @@ import { ref } from 'vue';
 import { ElMessage } from 'element-plus';
 import { useRouter } from 'vue-router';
 import { addairRaid } from '@/api/comprehensiveGuarantee/reliefResourceManagement/airRaidShelters';
+import { parseTime } from '@/utils/ruoyi';
 
 const emits = defineEmits(['close']);
 
@@ -249,7 +249,7 @@ const rules = ref({
   jsdw: [{ required: true, message: '建设单位不能为空', trigger: 'blur' }],
   whdw: [{ required: true, message: '维护单位不能为空', trigger: 'blur' }],
   rfzyjlgcs: [{ required: true, message: '人防专业监理工程师不能为空', trigger: 'blur' }],
-  jsdd: [{ required: true, message: '建设地点不能为空', trigger: 'blur' }],
+  jsdd: [{ required: true, message: '建设地点不能为空', trigger: 'change' }],
   cd_operation: [{ required: true, message: '操作方式不能为空', trigger: 'blur' }],
   yjrfdxsmj: [{ required: true, message: '应建人防地下室面积不能为空', trigger: 'blur' }],
   sjrfdxsmj: [{ required: true, message: '实建人防地下室面积不能为空', trigger: 'blur' }],
@@ -298,6 +298,8 @@ const router = useRouter();
 const submitForm = async () => {
   try {
     await form.value.validate();
+    // formData.value.kgsj = parseTime(formData.value.kgsj);
+    // formData.value.jgsj = parseTime(formData.value.jgsj);
     const payload = {
       projects: [formData.value]
     };

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersEdit.vue

@@ -41,10 +41,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="操作方式：" prop="cd_operation">
-                <el-input v-model="formData.cd_operation" style="width: 468px !important" />
+              <el-form-item label="人防设计单位：" prop="rfsjdw">
+                <el-input v-model="formData.rfsjdw" style="width: 468px !important" />
               </el-form-item>
             </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="操作方式：" prop="cd_operation">-->
+<!--                <el-input v-model="formData.cd_operation" style="width: 468px !important" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
@@ -58,28 +63,28 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="更新时间：" prop="cd_time">
-                <el-date-picker
-                  v-model="formData.cd_time"
-                  type="datetime"
-                  style="width: 468px !important"
-                  placeholder="请选择时间"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="新增时间：" prop="add_time">
-                <el-date-picker
-                  v-model="formData.add_time"
-                  type="datetime"
-                  style="width: 468px !important"
-                  placeholder="请选择时间"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row :gutter="20" class="mb8">-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="更新时间：" prop="cd_time">-->
+<!--                <el-date-picker-->
+<!--                  v-model="formData.cd_time"-->
+<!--                  type="datetime"-->
+<!--                  style="width: 468px !important"-->
+<!--                  placeholder="请选择时间"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="新增时间：" prop="add_time">-->
+<!--                <el-date-picker-->
+<!--                  v-model="formData.add_time"-->
+<!--                  type="datetime"-->
+<!--                  style="width: 468px !important"-->
+<!--                  placeholder="请选择时间"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="监理单位：" prop="jldw">
@@ -110,23 +115,16 @@
             </el-col>
           </el-row>
           <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="批次号：" prop="cd_batch">
-                <el-input v-model="formData.cd_batch" style="width: 468px !important" />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="批次号：" prop="cd_batch">-->
+<!--                <el-input v-model="formData.cd_batch" style="width: 468px !important" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="10">
               <el-form-item label="人防设计单位单位统一社会信用代码：" prop="rfsjdwdm">
                 <el-input v-model="formData.rfsjdwdm" style="width: 468px !important" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="人防设计单位：" prop="rfsjdw">
-                <el-input v-model="formData.rfsjdw" style="width: 468px !important" />
-              </el-form-item>
-            </el-col>
             <el-col :span="10">
               <el-form-item label="掩蔽人数：" prop="ybrs">
                 <el-input v-model="formData.ybrs" style="width: 468px !important" />

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersView.vue

@@ -37,10 +37,15 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="操作方式：" prop="cd_operation">
-                <el-input v-model="formData.cd_operation" style="width: 468px !important" disabled />
+              <el-form-item label="人防设计单位：" prop="rfsjdw">
+                <el-input v-model="formData.rfsjdw" style="width: 468px !important" disabled />
               </el-form-item>
             </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="操作方式：" prop="cd_operation">-->
+<!--                <el-input v-model="formData.cd_operation" style="width: 468px !important" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
           </el-row>
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
@@ -54,18 +59,18 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="更新时间：" prop="cd_time">
-                <el-input v-model="formData.cd_time" style="width: 468px !important" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item label="新增时间：" prop="add_time">
-                <el-input v-model="formData.add_time" style="width: 468px !important" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row :gutter="20" class="mb8">-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="更新时间：" prop="cd_time">-->
+<!--                <el-input v-model="formData.cd_time" style="width: 468px !important" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="新增时间：" prop="add_time">-->
+<!--                <el-input v-model="formData.add_time" style="width: 468px !important" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
               <el-form-item label="监理单位：" prop="jldw">
@@ -91,23 +96,16 @@
             </el-col>
           </el-row>
           <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="批次号：" prop="cd_batch">
-                <el-input v-model="formData.cd_batch" style="width: 468px !important" disabled />
-              </el-form-item>
-            </el-col>
+<!--            <el-col :span="10">-->
+<!--              <el-form-item label="批次号：" prop="cd_batch">-->
+<!--                <el-input v-model="formData.cd_batch" style="width: 468px !important" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="10">
               <el-form-item label="人防设计单位单位统一社会信用代码：" prop="rfsjdwdm">
                 <el-input v-model="formData.rfsjdwdm" style="width: 468px !important" disabled />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="10">
-              <el-form-item label="人防设计单位：" prop="rfsjdw">
-                <el-input v-model="formData.rfsjdw" style="width: 468px !important" disabled />
-              </el-form-item>
-            </el-col>
             <el-col :span="10">
               <el-form-item label="掩蔽人数：" prop="ybrs">
                 <el-input v-model="formData.ybrs" style="width: 468px !important" disabled />

src/views/comprehensiveGuarantee/reliefResourceManagement/shelterAdd.vue

@@ -70,6 +70,102 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按避难时长设计分类：" prop="duration_type">
+                <el-input v-model="formData.duration_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="按空间类型分类：" prop="space_type">
+                <el-input v-model="formData.space_type" placeholder="请输入空间类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按总体功能定位分类：" prop="function_type">
+                <el-input v-model="formData.function_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应急避难场所建设类型：" prop="construct_type">
+                <el-input v-model="formData.construct_type" placeholder="请输入建设类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="认定部门：" prop="identification_department">
+                <el-input v-model="formData.identification_department" placeholder="请输入认定部门" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="主管单位：" prop="sponsor">
+                <el-input v-model="formData.sponsor" placeholder="请输入主管单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设单位：" prop="construction_unit">
+                <el-input v-model="formData.construction_unit" placeholder="请输入建设单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建成时间：" prop="completion_time">
+                <el-input v-model="formData.completion_time" placeholder="请输入建成时间" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="规划情况：" prop="planning_situation">
+                <el-input v-model="formData.planning_situation" placeholder="请输入规划情况" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建设总投资（万元）：" prop="total_investment">
+                <el-input v-model="formData.total_investment" placeholder="请输入建设总投资" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设标准名称：" prop="standard_name">
+                <el-input v-model="formData.standard_name" placeholder="请输入建设标准名称" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="日常维护或管理人员数量：" prop="management_number">
+                <el-input v-model="formData.management_number" placeholder="请输入日常维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="其中：专职维护或管理人员数量：" prop="full_number">
+                <el-input v-model="formData.full_number" placeholder="请输入专职维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="产权/运维单位：" prop="property_unit">
+                <el-input v-model="formData.property_unit" placeholder="请输入产权/运维单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="运输投入：" prop="transportation_investment">
+                <el-input v-model="formData.transportation_investment" placeholder="请输入运输投入" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="运输投入渠道：" prop="channel">
+                <el-input v-model="formData.channel" placeholder="请输入运输投入渠道" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div class="common-dialog-footer">
           <el-button @click="closeDialog">取消</el-button>
@@ -91,17 +187,33 @@ import { addSheltert } from '@/api/comprehensiveGuarantee/reliefResourceManageme
 const emits = defineEmits(['close']);
 
 const formData = ref({
-  admin_area: '',
-  full_name: '',
-  address: '',
-  incident_type: '',
-  shelter_type: '',
-  lnglat: [],
-  total_area: '',
-  indoor_area: '',
-  capacity: '',
-  supplies: '',
-  facilities: ''
+  admin_area: '', //行政区域
+  full_name: '', //应急避难场所全称
+  address: '', //应急避难场所地址
+  incident_type: '', //按突发事件类型分类
+  shelter_type: '', //避难种类
+  lnglat: [], //经纬度
+  total_area: '', //占地总面积
+  indoor_area: '', //室内面积
+  capacity: '',  //容纳人数
+  supplies: '', //物资储备
+  facilities: '', //应急设施
+
+  duration_type: '', //避难时长分类
+  space_type: '', //空间类型分类
+  function_type: '', //功能定位分类
+  construct_type: '', //建设类型
+  sponsor: '', //主管单位
+  construction_unit: '', //建设单位
+  completion_time: '', //建成时间
+  planning_situation: '', //规划情况
+  total_investment: '', //建设总投资
+  standard_name: '', //建设标准名称
+  management_number: '', //日常维护或管理人员数量
+  full_number: '', //专职维护或管理人员数量
+  property_unit: '', //产权/运维单位
+  transportation_investment: '', //运输投入
+  channel: '' //运输投入渠道
 });
 
 const rules = ref({
@@ -114,7 +226,23 @@ const rules = ref({
   indoor_area: [{ required: true, message: '应急避难场所室内面积不能为空', trigger: 'blur' }],
   capacity: [{ required: true, message: '避难场所容纳人数不能为空', trigger: 'blur' }],
   supplies: [{ required: true, message: '物资储备不能为空', trigger: 'blur' }],
-  facilities: [{ required: true, message: '应急设施不能为空', trigger: 'blur' }]
+  facilities: [{ required: true, message: '应急设施不能为空', trigger: 'blur' }],
+
+  duration_type: [{ required: true, message: '避难时长分类不能为空', trigger: 'blur' }],
+  space_type: [{ required: true, message: '空间类型分类不能为空', trigger: 'blur' }],
+  function_type: [{ required: true, message: '功能定位分类不能为空', trigger: 'blur' }],
+  construct_type: [{ required: true, message: '建设类型不能为空', trigger: 'blur' }],
+  sponsor: [{ required: true, message: '主管单位不能为空', trigger: 'blur' }],
+  construction_unit: [{ required: true, message: '建设单位不能为空', trigger: 'blur' }],
+  completion_time: [{ required: true, message: '建成时间不能为空', trigger: 'blur' }],
+  planning_situation: [{ required: true, message: '规划情况不能为空', trigger: 'blur' }],
+  total_investment: [{ required: true, message: '建设总投资不能为空', trigger: 'blur' }],
+  standard_name: [{ required: true, message: '建设标准名称不能为空', trigger: 'blur' }],
+  management_number: [{ required: true, message: '日常维护或管理人员数量不能为空', trigger: 'blur' }],
+  full_number: [{ required: true, message: '专职维护或管理人员数量不能为空', trigger: 'blur' }],
+  property_unit: [{ required: true, message: '产权/运维单位不能为空', trigger: 'blur' }],
+  transportation_investment: [{ required: true, message: '运输投入不能为空', trigger: 'blur' }],
+  channel: [{ required: true, message: '运输投入渠道不能为空', trigger: 'blur' }]
 });
 
 const form = ref(null); // 定义 form 变量

src/views/comprehensiveGuarantee/reliefResourceManagement/shelterEdit.vue

@@ -70,6 +70,102 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按避难时长设计分类：" prop="duration_type">
+                <el-input v-model="formData.duration_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="按空间类型分类：" prop="space_type">
+                <el-input v-model="formData.space_type" placeholder="请输入空间类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按总体功能定位分类：" prop="function_type">
+                <el-input v-model="formData.function_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应急避难场所建设类型：" prop="construct_type">
+                <el-input v-model="formData.construct_type" placeholder="请输入建设类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="认定部门：" prop="identification_department">
+                <el-input v-model="formData.identification_department" placeholder="请输入认定部门" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="主管单位：" prop="sponsor">
+                <el-input v-model="formData.sponsor" placeholder="请输入主管单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设单位：" prop="construction_unit">
+                <el-input v-model="formData.construction_unit" placeholder="请输入建设单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建成时间：" prop="completion_time">
+                <el-input v-model="formData.completion_time" placeholder="请输入建成时间" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="规划情况：" prop="planning_situation">
+                <el-input v-model="formData.planning_situation" placeholder="请输入规划情况" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建设总投资（万元）：" prop="total_investment">
+                <el-input v-model="formData.total_investment" placeholder="请输入建设总投资" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设标准名称：" prop="standard_name">
+                <el-input v-model="formData.standard_name" placeholder="请输入建设标准名称" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="日常维护或管理人员数量：" prop="management_number">
+                <el-input v-model="formData.management_number" placeholder="请输入日常维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="其中：专职维护或管理人员数量：" prop="full_number">
+                <el-input v-model="formData.full_number" placeholder="请输入专职维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="产权/运维单位：" prop="property_unit">
+                <el-input v-model="formData.property_unit" placeholder="请输入产权/运维单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="运输投入：" prop="transportation_investment">
+                <el-input v-model="formData.transportation_investment" placeholder="请输入运输投入" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="运输投入渠道：" prop="channel">
+                <el-input v-model="formData.channel" placeholder="请输入运输投入渠道" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div class="common-dialog-footer">
           <el-button @click="closeDialog">取消</el-button>
@@ -115,7 +211,23 @@ const rules = ref({
   indoor_area: [{ required: true, message: '应急避难场所室内面积不能为空', trigger: 'blur' }],
   capacity: [{ required: true, message: '避难场所容纳人数不能为空', trigger: 'blur' }],
   supplies: [{ required: true, message: '物资储备不能为空', trigger: 'blur' }],
-  facilities: [{ required: true, message: '应急设施不能为空', trigger: 'blur' }]
+  facilities: [{ required: true, message: '应急设施不能为空', trigger: 'blur' }],
+
+  duration_type: [{ required: true, message: '避难时长分类不能为空', trigger: 'blur' }],
+  space_type: [{ required: true, message: '空间类型分类不能为空', trigger: 'blur' }],
+  function_type: [{ required: true, message: '功能定位分类不能为空', trigger: 'blur' }],
+  construct_type: [{ required: true, message: '建设类型不能为空', trigger: 'blur' }],
+  sponsor: [{ required: true, message: '主管单位不能为空', trigger: 'blur' }],
+  construction_unit: [{ required: true, message: '建设单位不能为空', trigger: 'blur' }],
+  completion_time: [{ required: true, message: '建成时间不能为空', trigger: 'blur' }],
+  planning_situation: [{ required: true, message: '规划情况不能为空', trigger: 'blur' }],
+  total_investment: [{ required: true, message: '建设总投资不能为空', trigger: 'blur' }],
+  standard_name: [{ required: true, message: '建设标准名称不能为空', trigger: 'blur' }],
+  management_number: [{ required: true, message: '日常维护或管理人员数量不能为空', trigger: 'blur' }],
+  full_number: [{ required: true, message: '专职维护或管理人员数量不能为空', trigger: 'blur' }],
+  property_unit: [{ required: true, message: '产权/运维单位不能为空', trigger: 'blur' }],
+  transportation_investment: [{ required: true, message: '运输投入不能为空', trigger: 'blur' }],
+  channel: [{ required: true, message: '运输投入渠道不能为空', trigger: 'blur' }]
 });
 
 const closeDialog = () => {

src/views/comprehensiveGuarantee/reliefResourceManagement/shelterView.vue

@@ -66,6 +66,102 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按避难时长设计分类：" prop="duration_type">
+                <el-input v-model="formData.duration_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="按空间类型分类：" prop="space_type">
+                <el-input v-model="formData.space_type" placeholder="请输入空间类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="按总体功能定位分类：" prop="function_type">
+                <el-input v-model="formData.function_type" placeholder="请输入分类" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="应急避难场所建设类型：" prop="construct_type">
+                <el-input v-model="formData.construct_type" placeholder="请输入建设类型" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="认定部门：" prop="identification_department">
+                <el-input v-model="formData.identification_department" placeholder="请输入认定部门" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="主管单位：" prop="sponsor">
+                <el-input v-model="formData.sponsor" placeholder="请输入主管单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设单位：" prop="construction_unit">
+                <el-input v-model="formData.construction_unit" placeholder="请输入建设单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建成时间：" prop="completion_time">
+                <el-input v-model="formData.completion_time" placeholder="请输入建成时间" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="规划情况：" prop="planning_situation">
+                <el-input v-model="formData.planning_situation" placeholder="请输入规划情况" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="建设总投资（万元）：" prop="total_investment">
+                <el-input v-model="formData.total_investment" placeholder="请输入建设总投资" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="建设标准名称：" prop="standard_name">
+                <el-input v-model="formData.standard_name" placeholder="请输入建设标准名称" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="日常维护或管理人员数量：" prop="management_number">
+                <el-input v-model="formData.management_number" placeholder="请输入日常维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="其中：专职维护或管理人员数量：" prop="full_number">
+                <el-input v-model="formData.full_number" placeholder="请输入专职维护或管理人员数量" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="产权/运维单位：" prop="property_unit">
+                <el-input v-model="formData.property_unit" placeholder="请输入产权/运维单位" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20" class="mb8">
+            <el-col :span="10">
+              <el-form-item label="运输投入：" prop="transportation_investment">
+                <el-input v-model="formData.transportation_investment" placeholder="请输入运输投入" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item label="运输投入渠道：" prop="channel">
+                <el-input v-model="formData.channel" placeholder="请输入运输投入渠道" style="width: 468px !important" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div class="common-dialog-footer">
           <el-button type="primary" @click="closeDialog">返回</el-button>

src/views/duty/eventing/eventDetails.vue

@@ -74,37 +74,11 @@
         <Step :step-data="eventTrackState" />
       </div>
     </div>
-    <!--    <div class="common-info-box">-->
-    <!--      <div class="common-info-header">-->
-    <!--        <i class="line-icon" />-->
-    <!--        <div class="common-info-title">指挥记录</div>-->
-    <!--      </div>-->
-    <!--      <div class="common-info-content">-->
-    <!--        <div class="list">-->
-    <!--          <div class="list-item">-->
-    <!--            <i class="img"></i>-->
-    <!--            <div class="item-title">大屏指挥记录</div>-->
-    <!--          </div>-->
-    <!--          <div class="list-item">-->
-    <!--            <i class="img"></i>-->
-    <!--            <div class="item-title">中屏指挥记录</div>-->
-    <!--          </div>-->
-    <!--        </div>-->
-    <!--      </div>-->
-    <!--    </div>-->
     <div class="common-info-box">
       <div class="common-info-header">
         <i class="line-icon" />
         <div class="common-info-title">匹配预案</div>
       </div>
-<!--      <div v-if="detailData.plan_name" class="common-info-content">-->
-<!--        <div class="list">-->
-<!--          <div class="list-item">-->
-<!--            <i class="img"></i>-->
-<!--            <div class="item-title">{{ detailData.plan_name }}</div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
       <div v-if="!!planFiles && planFiles.length > 0" class="common-info-content">
         <div class="list2">
           <div v-for="(item, index) in planFiles" :key="index" class="list-item" style="margin-bottom: 10px">
@@ -121,7 +95,7 @@
         <div class="item-title">暂无数据</div>
       </div>
     </div>
-    <el-dialog v-model="dialogTableVisible2" :title="detailInfo2.name" width="800" style="height: 520px">
+    <el-dialog v-model="dialogTableVisible2" :title="detailInfo2.name" width="800">
       <pdf-viewer v-if="dialogTableVisible2" :url="baseUrl + '/file/download/' + detailInfo2.url" />
     </el-dialog>
     <div class="common-info-box">
@@ -130,8 +104,6 @@
         <div class="common-info-title">事件总结报告</div>
       </div>
 
-<!--      <pdf-viewer :url="baseUrl + '/file/download/' + '87735cf0-ee73-11ef-862c-fa163e4bf12e.pdf'" />-->
-
       <div v-if="!!summaryFiles && summaryFiles.length > 0" class="common-info-content">
         <div class="list2">
           <div v-for="(item, index) in summaryFiles" :key="index" class="list-item" style="margin-bottom: 10px">
@@ -145,7 +117,7 @@
         </div>
       </div>
     </div>
-    <el-dialog v-model="dialogTableVisible" :title="detailInfo.file_name" width="800" style="height: 520px">
+    <el-dialog v-model="dialogTableVisible" :title="detailInfo.file_name" width="800">
       <pdf-viewer v-if="dialogTableVisible" :url="baseUrl + '/file/download/' + detailInfo.url" />
     </el-dialog>
     <el-dialog v-model="eventLevelState.show" title="事件等级" width="500" :before-close="handleEventLevelClose">