修复bug

src/components/Map/company-map.vue

@@ -99,7 +99,7 @@ export default {
       if (n) {
         await this.initMap();
         this.location = this.address;
-        this.handleInput(0);
+        // this.handleInput(0);
       }
     }
   },

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersAdd.vue

@@ -202,7 +202,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.jsdd" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -225,6 +225,7 @@ const formData = ref({
   cd_time: '',
   add_time: '',
   jldw: '',
+  lnglat: [],
   jsdwdm: '',
   kgsj: '',
   stdw: '',
@@ -286,6 +287,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.jsdd = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.jingdu = data.lnglat[0];
   formData.value.weidu = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/airRaidSheltersEdit.vue

@@ -202,7 +202,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.jsdd" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -221,6 +221,7 @@ const formData = ref({
   whdw: '',
   rfzyjlgcs: '',
   jsdd: '',
+  lnglat: [],
   cd_operation: '',
   yjdxsmj: '',
   sjdxsmj: '',
@@ -282,6 +283,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.jsdd = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.jingdu = data.lnglat[0];
   formData.value.weidu = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/hydraulicEngineeringAdd.vue

@@ -154,7 +154,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.slsshslgcdd" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -179,6 +179,7 @@ const formData = ref({
   sjtgbmxzqhdm: '',
   jsdwzjhm: '',
   xzqhdm: '',
+  lnglat: [],
   zdmj: '',
   etl_time: '',
   jssj: '',
@@ -226,6 +227,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.slsshslgcdd = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.jingdu = data.lnglat[0];
   formData.value.weidu = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/hydraulicEngineeringEdit.vue

@@ -154,7 +154,7 @@
     </div>
   </div>
 
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.slsshslgcdd" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -176,6 +176,7 @@ const formData = ref({
   lxfs: '',
   sjtgbmtyshxydm: '',
   jdgljgbm: '',
+  lnglat: [],
   cd_time: '',
   sjtgbmmc: '',
   ggmj: '',
@@ -224,6 +225,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.slsshslgcdd = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.jingdu = data.lnglat[0];
   formData.value.weidu = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueStation.vue

@@ -12,22 +12,23 @@
       </el-row>
       <!-- 表格组件 -->
       <el-table ref="multipleTable" v-loading="loading" :data="tableData" style="width: 100%">
+        <el-table-column label="序号" align="center" prop="id" fixed="left" />
         <el-table-column label="救助站名称" align="center" prop="fwdmc" fixed="left" width="140" />
-        <el-table-column label="服务对象" align="center" prop="fwdx" width="140" />
-        <el-table-column label="所属镇街" align="center" prop="zj" width="140" />
-        <el-table-column label="所属区县" align="center" prop="ssqx" width="140" />
-        <el-table-column label="服务内容" align="center" prop="fwnr" width="140" />
-        <el-table-column label="操作方式" align="center" prop="cd_operation" width="140" />
         <el-table-column label="救助站类型" align="center" prop="fwdlx" width="140" />
+        <el-table-column label="所属区县" align="center" prop="ssqx" width="140" />
+        <el-table-column label="所属镇街" align="center" prop="zj" width="140" />
+        <el-table-column label="服务点地址" align="center" prop="fwdaddr" width="140" />
+        <el-table-column label="联系人" align="center" prop="lxr" width="140" />
         <el-table-column label="联系电话" align="center" prop="lxdh" width="140" />
         <el-table-column label="开放时间" align="center" prop="kfsj" width="140" />
-        <el-table-column label="经度" align="center" prop="lng" width="140" />
-        <el-table-column label="纬度" align="center" prop="lat" width="140" />
-        <el-table-column label="救助站简介" align="center" prop="fwdjj" width="140" />
-        <el-table-column label="联系人" align="center" prop="lxr" width="140" />
         <el-table-column label="更新时间" align="center" prop="cd_time" width="140" />
-        <el-table-column label="服务点状态" align="center" prop="fwdzt" width="140" />
-        <el-table-column label="服务点地址" align="center" prop="fwdaddr" width="140" />
+<!--        <el-table-column label="服务对象" align="center" prop="fwdx" width="140" />-->
+<!--        <el-table-column label="服务内容" align="center" prop="fwnr" width="140" />-->
+<!--        <el-table-column label="操作方式" align="center" prop="cd_operation" width="140" />-->
+<!--        <el-table-column label="经度" align="center" prop="lng" width="140" />-->
+<!--        <el-table-column label="纬度" align="center" prop="lat" width="140" />-->
+<!--        <el-table-column label="救助站简介" align="center" prop="fwdjj" width="140" />-->
+<!--        <el-table-column label="服务点状态" align="center" prop="fwdzt" width="140" />-->
         <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/rescueStationAdd.vue

@@ -80,7 +80,7 @@
     </div>
   </div>
 
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.fwdaddr" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -98,6 +98,7 @@ const formData = ref({
   ssqx: '',
   fwdmc: '',
   fwnr: '',
+  lnglat: [],
   cd_operation: '',
   fwdlx: '',
   lxdh: '',
@@ -139,6 +140,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.fwdaddr = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.lng = data.lnglat[0];
   formData.value.lat = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueStationEdit.vue

@@ -79,7 +79,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" :address="formData.fwdaddr" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.fwdaddr" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -100,6 +100,7 @@ const formData = ref({
   fwnr: '',
   cd_operation: '',
   fwdlx: '',
+  lnglat: [],
   lxdh: '',
   kfsj: '',
   lng: '',
@@ -140,6 +141,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.fwdaddr = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.lng = data.lnglat[0];
   formData.value.lat = data.lnglat[1];
   mapDialogVisible.value = false;

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueStationView.vue

@@ -5,7 +5,7 @@
         <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" label-width="auto" class="custom-disabled">
           <el-form-item label="救助站名称：" prop="fwdmc">
             <el-input v-model="formData.fwdmc" style="width: 468px !important" disabled />
           </el-form-item>
@@ -67,6 +67,7 @@
 import { ref, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import { getStation } from '@/api/comprehensiveGuarantee/reliefResourceManagement/rescueStation';
+import { parseTime } from '@/utils/ruoyi';
 
 const emits = defineEmits(['close']);
 const props = defineProps<{
@@ -93,14 +94,33 @@ const closeDialog = () => {
 const fetchStationData = async () => {
   const response = await getStation(props.eventId);
   if (response.code === 200) {
+    response.station.cd_time = parseTime(response.station.cd_time);
+    response.station.kfsj = formatTimeRange(response.station.kfsj);
     formData.value = response.station;
   } else {
     ElMessage.error('未找到相关数据');
   }
 };
+
+const formatTimeRange = (timeStr) => {
+  // 使用正则表达式匹配小时部分并去除前导零（仅当小时为单个数字时）
+  return timeStr.replace(/(^|-)0([1-9]):/g, '$1$2:');
+}
 onMounted(() => {
   fetchStationData();
 });
 </script>
 
-<style scoped></style>
+<style scoped>
+.custom-disabled {
+  :deep(.el-select__wrapper.is-disabled),
+  :deep(.el-input__wrapper) {
+    background-color: #ffffff !important;
+  }
+  :deep(.el-select__wrapper.is-disabled .el-select__selected-item),
+  :deep(.el-input__inner) {
+    color: rgba(0, 0, 0, 0.85) !important;
+    -webkit-text-fill-color: rgba(0, 0, 0, 0.85) !important;
+  }
+}
+</style>

src/views/comprehensiveGuarantee/reliefResourceManagement/rescueUnitAdd.vue

@@ -55,7 +55,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" :address="formData.address" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.address" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -76,6 +76,7 @@ const formData = ref({
   address: '',
   position: '',
   team_size: '',
+  lnglat: [],
   longitude: '',
   latitude: '',
   supervisor_unit: ''
@@ -84,13 +85,13 @@ const formData = ref({
 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' }],
+  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' }],
+  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' }]
@@ -109,6 +110,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.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/shelterAdd.vue

@@ -79,7 +79,7 @@
     </div>
   </div>
 
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.address" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -96,6 +96,7 @@ const formData = ref({
   address: '',
   incident_type: '',
   shelter_type: '',
+  lnglat: [],
   total_area: '',
   indoor_area: '',
   capacity: '',
@@ -129,6 +130,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.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/shelterEdit.vue

@@ -79,7 +79,7 @@
     </div>
   </div>
   <!-- 地图弹窗 -->
-  <company-map v-model:visible="mapDialogVisible" @confirm="handleMapChange"></company-map>
+  <company-map v-model:visible="mapDialogVisible" :latAndLong="formData.lnglat" :address="formData.address" @confirm="handleMapChange"></company-map>
 </template>
 
 <script setup lang="ts">
@@ -101,6 +101,7 @@ const formData = ref({
   total_area: '',
   indoor_area: '',
   capacity: '',
+  lnglat: [],
   supplies: '',
   facilities: ''
 });
@@ -128,6 +129,7 @@ const openMapDialog = () => {
 
 const handleMapChange = (data) => {
   formData.value.address = data.address;
+  formData.value.lnglat = data.lnglat;
   formData.value.longitude = data.lnglat[0];
   formData.value.latitude = data.lnglat[1];
   mapDialogVisible.value = false;