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

src/views/comprehensiveGuarantee/reliefResourceManagement/hydraulicEngineeringAdd.vue

@@ -8,19 +8,19 @@
         <el-form ref="form" :model="formData" :rules="rules" label-width="auto">
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
-              <el-form-item label="水利设施和水利工程名称：" prop="gcmc">
+              <el-form-item label="水利设施和水利工程名称：" prop="slsshslgcmc">
                 <el-input v-model="formData.slsshslgcmc" placeholder="请输入水利设施和水利工程名称" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="建设单位名称：" prop="jsdw">
+              <el-form-item label="建设单位名称：" prop="jsdwmc">
                 <el-input v-model="formData.jsdwmc" 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="whdw">
+              <el-form-item label="水利设施和水利工程地点：" prop="slsshslgcdd">
                 <el-input v-model="formData.slsshslgcdd" placeholder="请输入水利设施和水利工程地点" style="width: 468px !important" readonly>
                   <template #append>
                     <el-button type="primary" @click="openMapDialog">地图定位</el-button>
@@ -29,31 +29,31 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="建设单位证件类型：" prop="rfzyjlgcs">
+              <el-form-item label="建设单位证件类型：" prop="jsdwzjlx">
                 <el-input v-model="formData.jsdwzjlx" 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="jsdd">
+              <el-form-item label="联系方式：" prop="lxfs">
                 <el-input v-model="formData.lxfs" placeholder="请输入联系方式" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="数据提供部门统一社会信用代码：" prop="cd_operation">
+              <el-form-item label="数据提供部门统一社会信用代码：" prop="sjtgbmtyshxydm">
                 <el-input v-model="formData.sjtgbmtyshxydm" 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="yjrfdxsmj">
+              <el-form-item label="监督管理机关编码：" prop="jdgljgbm">
                 <el-input v-model="formData.jdgljgbm" placeholder="请输入监督管理机关编码" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="插入时间：" prop="sjrfdxsmj">
+              <el-form-item label="插入时间：" prop="cd_time">
                 <el-date-picker
                   v-model="formData.cd_time"
                   type="datetime"
@@ -65,43 +65,43 @@
           </el-row>
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
-              <el-form-item label="数据提供部门名称：" prop="cs_time">
+              <el-form-item label="数据提供部门名称：" prop="sjtgbmmc">
                 <el-input v-model="formData.sjtgbmmc" placeholder="请输入数据提供部门名称" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="灌溉面积：" prop="add_time">
+              <el-form-item label="灌溉面积：" prop="ggmj">
                 <el-input v-model="formData.ggmj" 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">
+              <el-form-item label="数据提供部门行政区划代码：" prop="sjtgbmxzqhdm">
                 <el-input v-model="formData.sjtgbmxzqhdm" placeholder="请输入数据提供部门行政区划代码" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="建设单位证件号码：" prop="jsdwdm">
+              <el-form-item label="建设单位证件号码：" prop="jsdwzjhm">
                 <el-input v-model="formData.jsdwzjhm" 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="kgsj">
+              <el-form-item label="水利设施和水利工程所在地行政区划代码：" prop="xzqhdm">
                 <el-input v-model="formData.xzqhdm" placeholder="请输入水利设施和水利工程所在地行政区划代码" style="width: 468px !important" />
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="占地面积：" prop="stdw">
+              <el-form-item label="占地面积：" prop="zdmj">
                 <el-input v-model="formData.zdmj" 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="ETL时间：" prop="cd_batch">
+              <el-form-item label="ETL时间：" prop="etl_time">
                 <el-date-picker
                   v-model="formData.etl_time"
                   type="datetime"
@@ -111,7 +111,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="建设时间：" prop="rfsjdwdm">
+              <el-form-item label="建设时间：" prop="jssj">
                 <el-date-picker
                   v-model="formData.jssj"
                   type="datetime"
@@ -123,19 +123,19 @@
           </el-row>
           <el-row :gutter="20" class="mb8">
             <el-col :span="10">
-              <el-form-item label="数据批次号：" prop="rfsjdw">
+              <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="ybrs">
+              <el-form-item label="监督管理机关：" prop="jdgljg">
                 <el-input v-model="formData.jdgljg" 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="longitude">
+              <el-form-item label="经度：" prop="jingdu">
                 <el-input v-model="formData.jingdu" placeholder="请输入经度" style="width: 468px !important" />
               </el-form-item>
             </el-col>
@@ -190,26 +190,26 @@ const formData = ref({
 });
 
 const rules = ref({
-  gcmc: [{ required: true, message: '水利设施和水利工程名称不能为空', trigger: 'blur' }],
-  jsdw: [{ required: true, message: '建设单位名称不能为空', trigger: 'blur' }],
-  whdw: [{ required: true, message: '水利设施和水利工程地点不能为空', trigger: 'blur' }],
-  rfzyjlgcs: [{ required: true, message: '建设单位证件类型不能为空', trigger: 'blur' }],
-  jsdd: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  cd_operation: [{ required: true, message: '数据提供部门统一社会信用代码不能为空', trigger: 'blur' }],
-  yjrfdxsmj: [{ required: true, message: '监督管理机关编码不能为空', trigger: 'blur' }],
-  sjrfdxsmj: [{ required: true, message: '插入时间不能为空', trigger: 'blur' }],
-  cs_time: [{ required: true, message: '数据提供部门名称不能为空', trigger: 'blur' }],
-  add_time: [{ required: true, message: '灌溉面积不能为空', trigger: 'blur' }],
-  jldw: [{ required: true, message: '数据提供部门行政区划代码不能为空', trigger: 'blur' }],
-  jsdwdm: [{ required: true, message: '建设单位证件号码不能为空', trigger: 'blur' }],
-  kgsj: [{ required: true, message: '水利设施和水利工程所在地行政区划代码不能为空', trigger: 'blur' }],
-  stdw: [{ required: true, message: '占地面积不能为空', trigger: 'blur' }],
-  cd_batch: [{ required: true, message: 'ETL时间不能为空', trigger: 'blur' }],
-  rfsjdwdm: [{ required: true, message: '建设时间不能为空', trigger: 'blur' }],
-  rfsjdw: [{ required: true, message: '数据批次号不能为空', trigger: 'blur' }],
-  ybrs: [{ required: true, message: '监督管理机关不能为空', trigger: 'blur' }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
+  slsshslgcmc: [{ required: true, message: '水利设施和水利工程名称不能为空', trigger: 'blur' }],
+  jsdwmc: [{ required: true, message: '建设单位名称不能为空', trigger: 'blur' }],
+  slsshslgcdd: [{ required: true, message: '水利设施和水利工程地点不能为空', trigger: 'blur' }],
+  jsdwzjlx: [{ required: true, message: '建设单位证件类型不能为空', trigger: 'blur' }],
+  lxfs: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  sjtgbmtyshxydm: [{ required: true, message: '数据提供部门统一社会信用代码不能为空', trigger: 'blur' }],
+  jdgljgbm: [{ required: true, message: '监督管理机关编码不能为空', trigger: 'blur' }],
+  cd_time: [{ required: true, message: '插入时间不能为空', trigger: 'blur' }],
+  sjtgbmmc: [{ required: true, message: '数据提供部门名称不能为空', trigger: 'blur' }],
+  ggmj: [{ required: true, message: '灌溉面积不能为空', trigger: 'blur' }],
+  sjtgbmxzqhdm: [{ required: true, message: '数据提供部门行政区划代码不能为空', trigger: 'blur' }],
+  jsdwzjhm: [{ required: true, message: '建设单位证件号码不能为空', trigger: 'blur' }],
+  xzqhdm: [{ required: true, message: '水利设施和水利工程所在地行政区划代码不能为空', trigger: 'blur' }],
+  zdmj: [{ required: true, message: '占地面积不能为空', trigger: 'blur' }],
+  etl_time: [{ required: true, message: 'ETL时间不能为空', trigger: 'blur' }],
+  jssj: [{ required: true, message: '建设时间不能为空', trigger: 'blur' }],
+  cd_batch: [{ required: true, message: '数据批次号不能为空', trigger: 'blur' }],
+  jdgljg: [{ required: true, message: '监督管理机关不能为空', trigger: 'blur' }],
+  jingdu: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
+  weidu: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
 });
 
 const form = ref(null); // 定义 form 变量

src/views/comprehensiveGuarantee/reliefResourceManagement/hydraulicEngineeringEdit.vue

@@ -192,26 +192,26 @@ const formData = ref({
   weidu: ''
 });
 const rules = ref({
-  gcmc: [{ required: true, message: '水利设施和水利工程名称不能为空', trigger: 'blur' }],
-  jsdw: [{ required: true, message: '建设单位名称不能为空', trigger: 'blur' }],
-  whdw: [{ required: true, message: '水利设施和水利工程地点不能为空', trigger: 'blur' }],
-  rfzyjlgcs: [{ required: true, message: '建设单位证件类型不能为空', trigger: 'blur' }],
-  jsdd: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
-  cd_operation: [{ required: true, message: '数据提供部门统一社会信用代码不能为空', trigger: 'blur' }],
-  yjrfdxsmj: [{ required: true, message: '监督管理机关编码不能为空', trigger: 'blur' }],
-  sjrfdxsmj: [{ required: true, message: '插入时间不能为空', trigger: 'blur' }],
-  cs_time: [{ required: true, message: '数据提供部门名称不能为空', trigger: 'blur' }],
-  add_time: [{ required: true, message: '灌溉面积不能为空', trigger: 'blur' }],
-  jldw: [{ required: true, message: '数据提供部门行政区划代码不能为空', trigger: 'blur' }],
-  jsdwdm: [{ required: true, message: '建设单位证件号码不能为空', trigger: 'blur' }],
-  kgsj: [{ required: true, message: '水利设施和水利工程所在地行政区划代码不能为空', trigger: 'blur' }],
-  stdw: [{ required: true, message: '占地面积不能为空', trigger: 'blur' }],
-  cd_batch: [{ required: true, message: 'ETL时间不能为空', trigger: 'blur' }],
-  rfsjdwdm: [{ required: true, message: '建设时间不能为空', trigger: 'blur' }],
-  rfsjdw: [{ required: true, message: '数据批次号不能为空', trigger: 'blur' }],
-  ybrs: [{ required: true, message: '监督管理机关不能为空', trigger: 'blur' }],
-  longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
-  latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
+  slsshslgcmc: [{ required: true, message: '水利设施和水利工程名称不能为空', trigger: 'blur' }],
+  jsdwmc: [{ required: true, message: '建设单位名称不能为空', trigger: 'blur' }],
+  slsshslgcdd: [{ required: true, message: '水利设施和水利工程地点不能为空', trigger: 'blur' }],
+  jsdwzjlx: [{ required: true, message: '建设单位证件类型不能为空', trigger: 'blur' }],
+  lxfs: [{ required: true, message: '联系方式不能为空', trigger: 'blur' }],
+  sjtgbmtyshxydm: [{ required: true, message: '数据提供部门统一社会信用代码不能为空', trigger: 'blur' }],
+  jdgljgbm: [{ required: true, message: '监督管理机关编码不能为空', trigger: 'blur' }],
+  cd_time: [{ required: true, message: '插入时间不能为空', trigger: 'blur' }],
+  sjtgbmmc: [{ required: true, message: '数据提供部门名称不能为空', trigger: 'blur' }],
+  ggmj: [{ required: true, message: '灌溉面积不能为空', trigger: 'blur' }],
+  sjtgbmxzqhdm: [{ required: true, message: '数据提供部门行政区划代码不能为空', trigger: 'blur' }],
+  jsdwzjhm: [{ required: true, message: '建设单位证件号码不能为空', trigger: 'blur' }],
+  xzqhdm: [{ required: true, message: '水利设施和水利工程所在地行政区划代码不能为空', trigger: 'blur' }],
+  zdmj: [{ required: true, message: '占地面积不能为空', trigger: 'blur' }],
+  etl_time: [{ required: true, message: 'ETL时间不能为空', trigger: 'blur' }],
+  jssj: [{ required: true, message: '建设时间不能为空', trigger: 'blur' }],
+  cd_batch: [{ required: true, message: '数据批次号不能为空', trigger: 'blur' }],
+  jdgljg: [{ required: true, message: '监督管理机关不能为空', trigger: 'blur' }],
+  jingdu: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
+  weidu: [{ required: true, message: '纬度不能为空', trigger: 'blur' }]
 });
 
 const closeDialog = () => {

src/views/comprehensiveGuarantee/reliefResourceManagement/reliefTalentsAdd.vue

@@ -40,7 +40,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" :address="formData.current_address" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.current_address" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -56,6 +56,7 @@ const formData = ref({
   contact_number: '',
   gender: '',
   current_address: '',
+  lnglat: [],
   longitude: '', // 经度
   latitude: '', // 纬度
   position: '',
@@ -85,6 +86,7 @@ const openMapDialog = () => {
 };
 const handleMapChange = (data) => {
   formData.value.current_address = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.longitude = data.lnglat[0];
   formData.value.latitude = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/reliefTalentsEdit.vue

@@ -2,10 +2,10 @@
   <div class="common-dialog">
     <div class="common-dialog-content">
       <div class="common-dialog-title-box">
-        <h3 class="common-dialog-title">编辑</h3>
+        <h3 class="common-dialog-title">编辑救援人才</h3>
       </div>
       <div class="common-dialog-box">
-        <el-form ref="form" :model="formData" label-width="auto">
+        <el-form ref="form" :model="formData" :rules="rules" label-width="auto">
           <el-form-item label="姓名：" prop="name">
             <el-input v-model="formData.name" style="width: 468px !important"  />
           </el-form-item>
@@ -30,14 +30,14 @@
           </el-form-item>
         </el-form>
         <div class="common-dialog-footer">
-          <el-button type="primary" @click="submitForm">确定</el-button>
           <el-button @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
         </div>
       </div>
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" :address="formData.current_address" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.current_address" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -55,12 +55,20 @@ const formData = ref({
   contact_number: '',
   gender: '',
   current_address: '',
+  lnglat: [],
   longitude: '', // 经度
   latitude: '', // 纬度
   position: '',
   unit_name: ''
 });
-
+const rules = ref({
+  name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+  contact_number: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+  gender: [{ required: true, message: '性别不能为空', trigger: 'blur' }],
+  current_address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+  position: [{ required: true, message: '职务不能为空', trigger: 'blur' }],
+  unit_name: [{ required: true, message: '所属救援人员单位不能为空', trigger: 'blur' }]
+});
 const closeDialog = () => {
   emits('close');
 };
@@ -71,6 +79,7 @@ const openMapDialog = () => {
 };
 const handleMapChange = (data) => {
   formData.value.current_address = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.longitude = data.lnglat[0];
   formData.value.latitude = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueUnitEdit.vue

@@ -2,10 +2,10 @@
   <div class="common-dialog">
     <div class="common-dialog-content">
       <div class="common-dialog-title-box">
-        <h3 class="common-dialog-title">编辑</h3>
+        <h3 class="common-dialog-title">编辑救援人员单位</h3>
       </div>
       <div class="common-dialog-box">
-        <el-form ref="form" :model="formData" label-width="auto">
+        <el-form ref="form" :model="formData" :rules="rules" label-width="auto">
           <el-form-item label="救援人员单位：" prop="name">
             <el-input v-model="formData.name" style="width: 468px !important" />
           </el-form-item>
@@ -48,8 +48,8 @@
           </el-form-item>
         </el-form>
         <div class="common-dialog-footer">
-          <el-button type="primary" @click="submitForm">确定</el-button>
           <el-button @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitForm">确定</el-button>
         </div>
       </div>
     </div>
@@ -83,6 +83,21 @@ const formData = ref({
   supervisor_unit: ''
 });
 
+const rules = ref({
+  name: [{ required: true, message: '救援人员单位不能为空', trigger: 'blur' }],
+  category: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
+  contact_number: [{ required: true, message: '联系电话不能为空', trigger: 'blur' }],
+  responsible_person: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  address: [{ required: true, message: '地址不能为空', trigger: 'blur' }],
+  equipment: [{ required: true, message: '装备不能为空', trigger: 'blur' }],
+  training: [{ required: true, message: '训练不能为空', trigger: 'blur' }],
+  position: [{ required: true, message: '负责人职务不能为空', trigger: 'blur' }],
+  team_size: [{ required: true, message: '队伍人数不能为空', trigger: 'blur' }],
+  longitude: [{ required: true, message: '经度不能为空', trigger: 'blur' }],
+  latitude: [{ required: true, message: '纬度不能为空', trigger: 'blur' }],
+  supervisor_unit: [{ required: true, message: '主管单位不能为空', trigger: 'blur' }]
+});
+
 const closeDialog = () => {
   emits('close');
 };

src/views/knowledge/knowledge-management/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <div class="app-container">
+      <h1>事件总结报告</h1>
       <div v-show="!dialog.visible && !knowledgeDetailState.show">
         <transition name="fade">
           <div v-show="showSearch">