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

src/types/components.d.ts

@@ -27,16 +27,10 @@ declare module 'vue' {
     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']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     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']
@@ -47,10 +41,7 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     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']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -60,22 +51,13 @@ declare module 'vue' {
     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']
-    ElSlider: typeof import('element-plus/es')['ElSlider']
-    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']
@@ -90,9 +72,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/MaterialReserveManagement/InboundManagement.vue

@@ -11,39 +11,39 @@
           </el-row>
         </transition>
         <el-table ref="multipleTable" v-loading="loading" :data="tableData" border :max-height="maxHeight" style="width: 96%">
-          <el-table-column label="入库单号" align="center" prop="inbound_order_number" width="120" fixed />
-          <el-table-column label="仓库名称" align="center" prop="warehouse_name" width="150" />
-          <el-table-column label="库房名称" align="center" prop="room_name" width="120" />
-          <el-table-column label="类型" align="center" prop="type" width="150">
+          <el-table-column label="入库单号" align="center" prop="inbound_order_number" fixed />
+          <el-table-column label="仓库名称" align="center" prop="warehouse_name" />
+          <el-table-column label="库房名称" align="center" prop="room_name" />
+          <el-table-column label="类型" align="center" prop="type">
             <template #default="scope">
               <dict-tag :options="sys_store_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="供应商名称" align="center" prop="supplier_name" width="120" />
-          <el-table-column label="是否捐赠" align="center" prop="is_donation" width="80" >
+          <el-table-column label="供应商名称" align="center" prop="supplier_name" />
+          <el-table-column label="是否捐赠" align="center" prop="is_donation" >
             <template #default="scope">
               <dict-tag :options="sys_yes_no" :value="scope.row.is_donation" />
             </template>
           </el-table-column>
-          <el-table-column label="采购单号" align="center" prop="purchase_order_number" width="150" />
-          <el-table-column label="运单号" align="center" prop="transport_order_number" width="120" />
-          <el-table-column label="捐赠人联系电话" align="center" prop="donator_phone" width="120" />
-          <el-table-column label="捐赠人姓名" align="center" prop="donator_name" width="120" />
-          <el-table-column label="审核人" align="center" prop="reviewer" width="120" />
-          <el-table-column label="企业名称" align="center" prop="enterprise_name" width="120" />
-          <el-table-column label="企业编号" align="center" prop="enterprise_code" width="120" />
-          <el-table-column label="分级信息" align="center" prop="grading_info" width="120" />
-          <el-table-column label="创建时间" align="center" prop="creation_time" width="120" />
-          <el-table-column label="备注" align="center" prop="remark" width="120" />
-          <el-table-column label="供应商编号" align="center" prop="supplier_code" width="120" />
-          <el-table-column label="完成时间" align="center" prop="completion_time" width="120">
+          <el-table-column label="采购单号" align="center" prop="purchase_order_number" />
+          <el-table-column label="运单号" align="center" prop="transport_order_number" />
+<!--          <el-table-column label="捐赠人联系电话" align="center" prop="donator_phone" width="120" />-->
+<!--          <el-table-column label="捐赠人姓名" align="center" prop="donator_name" width="120" />-->
+<!--          <el-table-column label="审核人" align="center" prop="reviewer" width="120" />-->
+<!--          <el-table-column label="企业名称" align="center" prop="enterprise_name" width="120" />-->
+<!--          <el-table-column label="企业编号" align="center" prop="enterprise_code" width="120" />-->
+<!--          <el-table-column label="分级信息" align="center" prop="grading_info" width="120" />-->
+<!--          <el-table-column label="创建时间" align="center" prop="creation_time" width="120" />-->
+<!--          <el-table-column label="备注" align="center" prop="remark" width="120" />-->
+<!--          <el-table-column label="供应商编号" align="center" prop="supplier_code" width="120" />-->
+<!--          <el-table-column label="完成时间" align="center" prop="completion_time" width="120" />-->
 
-          </el-table-column>
-          <el-table-column label="计划完成时间" align="center" prop="planned_completion_time" width="120" />
+
+<!--          <el-table-column label="计划完成时间" align="center" prop="planned_completion_time" width="120" />-->
 <!--          <el-table-column label="仓库名称" align="center" prop="warehouse_name" width="120" />-->
-          <el-table-column label="新增时间" align="center" prop="new_time" width="120" />
+<!--          <el-table-column label="新增时间" align="center" prop="new_time" width="120" />-->
 <!--          <el-table-column label="入库单" align="center" fixed="right" width="88" class-name="small-padding fixed-width"/>-->
-          <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-button type="text" class="common-btn-text-primary" @click="handleWrite(scope.row)">查看</el-button>
                 <el-button type="text" class="common-btn-text-primary" @click="goToInventory(scope.row.inbound_order_number)">明细</el-button>

src/views/comprehensiveGuarantee/MaterialReserveManagement/OutboundManagement.vue

@@ -11,24 +11,25 @@
           </el-row>
         </transition>
         <el-table ref="multipleTable" v-loading="loading" :data="tableData" border :max-height="maxHeight" style="width: 96%">
-          <el-table-column label="出库单号" align="center" prop="outbound_number" width="150" fixed />
-          <el-table-column label="仓库名称" align="center" prop="warehouse_id" width="120" />
-          <el-table-column label="出库单商品总体积(cm³）" align="center" prop="total_volume" width="120" />
-          <el-table-column label="出库单商品总重量(kg)" align="center" prop="total_weight" width="120" />
-          <el-table-column label="出库单发货总体积(cm³)" align="center" prop="total_shipping_volume" width="150" />
-          <el-table-column label="出库单发货总重量(kg)" align="center" prop="total_shipping_weight" width="150" />
-          <el-table-column label="出库单商品总数量" align="center" prop="total_quantity" width="120" />
-          <el-table-column label="出库单发货时间" align="center" prop="shipping_time" width="180" />
-          <el-table-column label="灾种名称" align="center" prop="disaster_type" width="120" />
-          <el-table-column label="调运机构名称" align="center" prop="dispatching_agency" width="150" />
-          <el-table-column label="发货人姓名" align="center" prop="shipper_name" width="120" />
-          <el-table-column label="发货人手机" align="center" prop="shipper_mobile" width="120" />
-          <el-table-column label="发货人地址" align="center" prop="shipper_address" width="200" />
-          <el-table-column label="发货方备注" align="center" prop="shipper_remark" width="180" />
-          <el-table-column label="收货人姓名" align="center" prop="receiver_name" width="120" />
-          <el-table-column label="收货人手机" align="center" prop="receiver_mobile" width="120" />
-          <el-table-column label="收货人地址" align="center" prop="receiver_address" width="200" />
-          <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
+          <el-table-column label="出库单号" align="center" prop="outbound_number" fixed />
+          <el-table-column label="仓库名称" align="center" prop="warehouse_name" />
+          <el-table-column label="库房名称" align="center" prop="room_name" />
+<!--          <el-table-column label="出库单商品总体积(cm³）" align="center" prop="total_volume" width="120" />-->
+<!--          <el-table-column label="出库单商品总重量(kg)" align="center" prop="total_weight" width="120" />-->
+<!--          <el-table-column label="出库单发货总体积(cm³)" align="center" prop="total_shipping_volume" width="150" />-->
+<!--          <el-table-column label="出库单发货总重量(kg)" align="center" prop="total_shipping_weight" width="150" />-->
+<!--          <el-table-column label="出库单商品总数量" align="center" prop="total_quantity" width="120" />-->
+<!--          <el-table-column label="出库单发货时间" align="center" prop="shipping_time" width="180" />-->
+          <el-table-column label="灾种名称" align="center" prop="disaster_type" />
+          <el-table-column label="调运机构名称" align="center" prop="dispatching_agency" />
+<!--          <el-table-column label="发货人姓名" align="center" prop="shipper_name" width="120" />-->
+<!--          <el-table-column label="发货人手机" align="center" prop="shipper_mobile" width="120" />-->
+<!--          <el-table-column label="发货人地址" align="center" prop="shipper_address" width="200" />-->
+<!--          <el-table-column label="发货方备注" align="center" prop="shipper_remark" width="180" />-->
+<!--          <el-table-column label="收货人姓名" align="center" prop="receiver_name" width="120" />-->
+<!--          <el-table-column label="收货人手机" align="center" prop="receiver_mobile" width="120" />-->
+<!--          <el-table-column label="收货人地址" align="center" prop="receiver_address" width="200" />-->
+          <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
             <template #default="scope">
               <el-button type="text" class="common-btn-text-primary" @click="handleWrite(scope.row)">查看</el-button>
               <el-button type="text" class="common-btn-text-primary" @click="goToInventory(scope.row.outbound_number)">明细</el-button>

src/views/comprehensiveGuarantee/MaterialReserveManagement/addInbound.vue

@@ -101,7 +101,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="报告附件：" prop="filename">
+          <el-form-item label="上传入库单：" prop="filename">
             <file-upload v-model="form.filename" :limit="1" :file-type="['xlsx','xls']" />
           </el-form-item>
 

src/views/comprehensiveGuarantee/MaterialReserveManagement/addOutbound.vue

@@ -7,13 +7,13 @@
       </div>
       <div class="common-dialog-box">
         <el-form ref="eventFormRef" :model="form" :rules="rules" label-width="200px">
-          <el-form-item label="出库单号：" prop="outbound_number">
-            <el-input v-model="form.outbound_number" placeholder="请输入出库单号" style="width: 468px !important" />
-          </el-form-item>
+<!--          <el-form-item label="出库单号：" prop="outbound_number">-->
+<!--            <el-input v-model="form.outbound_number" placeholder="请输入出库单号" style="width: 468px !important" />-->
+<!--          </el-form-item>-->
 
-          <el-form-item label="库房名称：" prop="warehouse_id">
+          <el-form-item label="库房名称：" prop="room_id">
             <el-tree-select
-              v-model="form.warehouse_id"
+              v-model="form.room_id"
               :data="warehouseName"
               node-key="id"
               placeholder="请选择库房名称"
@@ -82,7 +82,7 @@
             <el-input v-model="form.receiver_address" placeholder="请输入收货人地址" style="width: 468px !important" />
           </el-form-item>
 
-          <el-form-item label="报告附件：" prop="filename">
+          <el-form-item label="上传出库单：" prop="filename">
             <file-upload v-model="form.filename" :limit="1" :file-type="['xlsx','xls']" />
           </el-form-item>
         </el-form>
@@ -107,23 +107,23 @@ const buttonLoading = ref(false);
 const eventFormRef = ref('');
 // 表单初始数据
 const initFormData = {
-  outbound_number: '123', // 出库单号
-  warehouse_id: '应急仓库1', // 仓库名称
-  total_volume: '256', // 出库单商品总体积
-  total_weight: '0', // 出库单商品总重量
-  total_shipping_volume: '256', // 出库单发货总体积
-  total_shipping_weight: '256', // 出库单发货总重量
-  total_quantity: '128', // 出库单商品总数量
-  shipping_time: '2025-1-30', // 出库单发货时间
-  disaster_type: '名称', // 灾种名称
-  dispatching_agency: '机构名称', // 调运机构名称
-  shipper_name: '小名', // 发货人姓名
-  shipper_mobile: '13899703675', // 发货人手机
-  shipper_address: '茂名市', //发货人地址
-  shipper_remark: '这是备注', //备注
-  receiver_name: '姓名', //收货人姓名
-  receiver_mobile: '13899703675', //收货人手机
-  receiver_address: '地址', //收货人地址
+  outbound_number: '', // 出库单号
+  room_id: '', // 仓库名称
+  total_volume: '', // 出库单商品总体积
+  total_weight: '', // 出库单商品总重量
+  total_shipping_volume: '', // 出库单发货总体积
+  total_shipping_weight: '', // 出库单发货总重量
+  total_quantity: '', // 出库单商品总数量
+  shipping_time: '', // 出库单发货时间
+  disaster_type: '', // 灾种名称
+  dispatching_agency: '', // 调运机构名称
+  shipper_name: '', // 发货人姓名
+  shipper_mobile: '', // 发货人手机
+  shipper_address: '', //发货人地址
+  shipper_remark: '', //备注
+  receiver_name: '', //收货人姓名
+  receiver_mobile: '', //收货人手机
+  receiver_address: '', //收货人地址
   filename: [],  //附件
 
 };
@@ -133,7 +133,7 @@ const data = reactive({
   form: { ...initFormData },
   rules: {
     outbound_number: [{ required: true, message: '出库单号不能为空', trigger: 'blur' }],
-    warehouse_id: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
+    room_id: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
     total_volume: [{ required: true, message: '出库单商品总体积不能为空', trigger: 'blur' }],
     total_weight: [{ required: true, message: '出库单商品总重量不能为空', trigger: 'blur' }],
     total_shipping_volume: [{ required: true, message: '出库单发货总体积不能为空', trigger: 'blur' }],

src/views/comprehensiveGuarantee/MaterialReserveManagement/outboundDetails.vue

@@ -6,8 +6,8 @@
       </div>
       <div class="common-dialog-box">
         <el-form ref="formRef" :model="form" label-width="160px"  disabled class="custom-disabled" >
-          <el-form-item label="仓库名称：" prop="warehouse_id">
-            <el-input v-model="form.warehouse_id" style="width: 468px" />
+          <el-form-item label="仓库名称：" prop="warehouse_name">
+            <el-input v-model="form.warehouse_name" style="width: 468px" />
           </el-form-item>
           <el-form-item label="出库单商品总体积(cm³)：" prop="total_volume">
             <el-input v-model="form.total_volume" style="width: 468px" />
@@ -79,7 +79,7 @@ const props = defineProps({
 // 模拟的数据
 const form = ref({
   outbound_number: '', // 出库单号
-  warehouse_id: '', // 仓库名称
+  warehouse_name: '', // 仓库名称
   total_volume: '', // 出库单商品总体积(cm³)
   total_weight: '', // 出库单商品总重量(kg)
   total_shipping_volume: '', // 出库单发货总体积(cm³)
@@ -94,7 +94,8 @@ const form = ref({
   shipper_remark: '', // 发货方备注
   receiver_name: '', // 收货人姓名
   receiver_mobile: '', // 收货人手机
-  receiver_address: '' // 收货人地址
+  receiver_address: '', // 收货人地址
+  filename: [],  //附件
 });
 
 getOutboundOrderInfo(props.id).then((res) => {

src/views/globalMap/RightMenu/KeyVehicles.vue

@@ -22,8 +22,12 @@
       <div class="table-content">
         <div v-for="(item, index) in dataList" :key="item.id" class="tr">
           <div class="td">{{ item.vehicle_no }}</div>
-          <div class="td">{{ item.alarm_flag }}</div>
-          <div class="td">{{ item.vehicle_type }}</div>
+          <div class="td">
+            <dict-tag :options="alarm_identification" :value="item.alarm_flag" />
+          </div>
+          <div class="td">
+            <dict-tag :options="car_type" :value="item.vehicle_type" />
+          </div>
           <div class="td">{{ parseTime(item.gpsDate) }}</div>
           <div class="td" style="width: 120px; flex: unset">
             <div class="text" @click="handleConnect(index, item)">连线</div>
@@ -40,6 +44,8 @@
 import { Search } from '@element-plus/icons-vue';
 import { getVehicleList, getVehicleTrajectory } from '@/api/globalMap/KeyVehicles';
 import { parseTime } from '@/utils/ruoyi';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { car_type, alarm_identification } = toRefs<any>(proxy?.useDict('car_type', 'alarm_identification'));
 
 const AMapType = ['vectorgraph', 'satellite'];
 const initDataToPlay = inject('initDataToPlay');

src/views/informationissue/informationApplication.vue

@@ -6,102 +6,110 @@
       </div>
       <div class="common-dialog-box">
         <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px">
-          <h4 class="common-dialog-title">信息内容</h4>
           <div class="box1">
+            <h3 class="common-dialog-title" style="font-weight: bold;margin-bottom: 20px;margin-left: 50px">信息内容</h3>
+            <div style="margin-left: 60px;margin-bottom: 60px">
+              <el-form-item label="标题：" prop="title">
+                <el-input v-model="formData.title" placeholder="请输入标题" style="width: 468px !important" />
+              </el-form-item>
 
-            <el-form-item label="标题：" prop="title">
-              <el-input v-model="formData.title" placeholder="请输入标题" style="width: 468px !important" />
-            </el-form-item>
+              <el-form-item label="信息类型：" prop="info_type">
+                <el-select v-model="formData.info_type" placeholder="请选择信息类型" style="width: 468px !important">
+                  <el-option v-for="dict in mm_info_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
+                </el-select>
+              </el-form-item>
 
-            <el-form-item label="信息类型：" prop="info_type">
-              <el-select v-model="formData.info_type" placeholder="请选择信息类型">
-                <el-option v-for="dict in mm_info_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-              </el-select>
-            </el-form-item>
+              <el-form-item label="发布单位：" prop="publish_group">
+                <el-input v-model="formData.publish_group" placeholder="请输入发布单位" style="width: 468px !important" />
+              </el-form-item>
 
-            <el-form-item label="发布单位：" prop="publish_group">
-              <el-input v-model="formData.publish_group" placeholder="请输入发布单位" style="width: 468px !important" />
-            </el-form-item>
-
-            <el-form-item label="信息模板：" prop="template_type">
-              <el-radio-group v-model="formData.template_type">
-                <el-radio value="0">预设模板</el-radio>
-                <el-radio value="1">自定义模板</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item v-if="formData.template_type === '0'" label="预设模板：" prop="template_type">
-              <el-select
-                v-model="formData.template_id"
-                placeholder="请选择预设模板"
-                style="width: 300px !important"
-                @change="handleTemplateIdChanged"
-              >
-                <el-option v-for="option in presetTemplates" :key="option.value" :label="option.label" :value="option.value"></el-option>
-              </el-select>
-              <el-text class="common-btn-text-primary" @click="showTemplateExample">样例</el-text>
-            </el-form-item>
-            <el-form-item v-if="formData.template_type === '1'" prop="template_url">
-              <el-input v-model="formData.template_url" placeholder="请输入自定义详情页面链接地址" style="width: 468px !important" />
-            </el-form-item>
-            <el-form-item label="信息内容：" prop="content">
-              <el-input v-model="formData.content" :rows="6" type="textarea" placeholder="请输入信息内容" style="width: 468px !important"></el-input>
-            </el-form-item>
-            <el-form-item label="上传附件：" prop="attachs">
-              <file-upload v-model="formData.attachs" :limit="4" :file-type="['pdf', 'doc', 'docx', 'jpg', 'png']" />
-            </el-form-item>
+              <el-form-item label="信息模板：" prop="template_type">
+                <el-radio-group v-model="formData.template_type">
+                  <el-radio value="0">预设模板</el-radio>
+                  <el-radio value="1">自定义模板</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item v-if="formData.template_type === '0'" label="预设模板：" prop="template_type">
+                <el-select
+                  v-model="formData.template_id"
+                  placeholder="请选择预设模板"
+                  style="width: 468px !important"
+                  @change="handleTemplateIdChanged"
+                >
+                  <el-option v-for="option in presetTemplates" :key="option.value" :label="option.label" :value="option.value"></el-option>
+                </el-select>
+                <el-text class="common-btn-text-primary" @click="showTemplateExample">样例</el-text>
+              </el-form-item>
+              <el-form-item v-if="formData.template_type === '1'" prop="template_url">
+                <el-input v-model="formData.template_url" placeholder="请输入自定义详情页面链接地址" style="width: 468px !important" />
+              </el-form-item>
+              <el-form-item label="信息内容：" prop="content">
+                <el-input v-model="formData.content" :rows="6" type="textarea" placeholder="请输入信息内容" style="width: 468px !important"></el-input>
+              </el-form-item>
+              <el-form-item label="上传附件：" prop="attachs">
+                <file-upload v-model="formData.attachs" :limit="4" :file-type="['pdf', 'doc', 'docx', 'jpg', 'png']" />
+              </el-form-item>
+            </div>
           </div>
 
-          <h4 class="common-dialog-title">推送配置</h4>
+
           <div class="box1">
-            <el-form-item label="发布名单：" prop="releaseList" style="width: 468px !important"
-              ><span class="highlight-text">已选择{{ formData.user_count }}人</span>
-              <el-text class="common-btn-text-primary" @click="toggleReleaseList">查看详情</el-text>
-            </el-form-item>
-            <el-row :gutter="18">
-              <el-col :span="14">
-                <el-form-item label="发布时间：" prop="publish_time">
-                  <el-radio-group v-model="formData.publish_type">
-                    <el-radio :value="'0'" @change="publishNow">立即发布</el-radio>
-                    <el-radio :value="'1'">定时发布</el-radio>
-                  </el-radio-group>
-                  <div v-if="formData.publish_type === '0'" style="min-width: 240px">发布时间：{{ formattedCurrentTime }}</div>
-                  <el-date-picker v-else v-model="formData.publish_time" type="datetime" placeholder="选择发布时间" style="width: 250px !important" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="消息反馈方式：" prop="response_type" style="width: 300px !important">
-              <el-select v-model="formData.response_type" placeholder="请选择消息反馈方式">
-                <el-option v-for="option in feedbackOptions" :key="option.value" :label="option.label" :value="option.value"></el-option>
-              </el-select>
-            </el-form-item>
+            <h3 class="common-dialog-title" style="font-weight: bold;margin-bottom: 20px;margin-left: 50px">推送配置</h3>
+            <div style="margin-left: 60px;margin-bottom: 60px">
+              <el-form-item label="发布名单：" prop="releaseList" style="width: 468px !important">
+                <span class="highlight-text" style="margin-right: 20px; margin-left: 20px">已选择{{ formData.user_count }}人</span>
+                <el-text class="common-btn-text-primary" @click="toggleReleaseList">查看详情</el-text>
+              </el-form-item>
+              <el-row :gutter="18">
+                <el-col :span="14">
+                  <el-form-item label="发布时间：" prop="publish_time">
+                    <el-radio-group v-model="formData.publish_type" style="margin-left: 20px">
+                      <el-radio :value="'0'" @change="publishNow">立即发布</el-radio>
+                      <el-radio :value="'1'">定时发布</el-radio>
+                    </el-radio-group>
+                    <div v-if="formData.publish_type === '0'" style="min-width: 240px; margin-left: 20px">发布时间：{{ formattedCurrentTime }}</div>
+                    <el-date-picker v-else v-model="formData.publish_time" type="datetime" placeholder="选择发布时间" style="width: 250px !important; margin-left: 20px" />
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-form-item label="消息反馈方式：" prop="response_type" style="width: 600px !important">
+                <el-select v-model="formData.response_type" placeholder="请选择消息反馈方式" style="margin-left: 20px">
+                  <el-option v-for="option in feedbackOptions" :key="option.value" :label="option.label" :value="option.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </div>
           </div>
-          <h4 class="common-dialog-title">审核配置</h4>
+
           <div class="box1">
-            <el-form-item label="审核材料：" prop="examine_attachs">
-              <file-upload v-model="formData.examine_attachs" :limit="4" :file-type="['pdf', 'doc', 'docx', 'jpg', 'png']" />
-            </el-form-item>
-            <el-form-item label="审核人：" prop="auditor">
-              <el-autocomplete
-                v-model="formData.examine_user"
-                :fetch-suggestions="querySearch"
-                placeholder="请输入审核人姓名"
-                style="width: 368px !important"
-                @select="handleSelect"
-              >
-                <template #default="{ item }">
-                  <div class="item_row">
-                    <div class="item_row_user_name">账号：<span v-html="highlightKeyword(item)"></span></div>
-                    <div class="item_row_nick_name">姓名：{{ item.nickName }}</div>
-                    <div class="item_row_dept_name">单位：{{ item.deptName || "（空）" }}</div>
-                  </div>
-                </template>
+            <h3 class="common-dialog-title" style="font-weight: bold;margin-bottom: 20px;margin-left: 50px">审核配置</h3>
+            <div style="margin-left: 60px;margin-bottom: 60px">
+              <el-form-item label="审核材料：" prop="examine_attachs">
+                <file-upload v-model="formData.examine_attachs" :limit="4" :file-type="['pdf', 'doc', 'docx', 'jpg', 'png']" style="margin-left: 20px" />
+              </el-form-item>
+              <el-form-item label="审核人：" prop="auditor">
+                <el-autocomplete
+                  v-model="formData.examine_user"
+                  :fetch-suggestions="querySearch"
+                  placeholder="请输入审核人姓名"
+                  style="width: 478px !important; margin-left: 20px"
+                  @select="handleSelect"
+                >
+                  <template #default="{ item }">
+                    <div class="item_row">
+                      <div class="item_row_user_name">账号：<span v-html="highlightKeyword(item)"></span></div>
+                      <div class="item_row_nick_name">姓名：{{ item.nickName }}</div>
+                      <div class="item_row_dept_name">单位：{{ item.deptName || "（空）" }}</div>
+                    </div>
+                  </template>
 
-                <template #suffix>
-                  <i class="el-icon-search"></i>
-                </template>
-              </el-autocomplete>
-            </el-form-item>
+                  <template #suffix>
+                    <i class="el-icon-search"></i>
+                  </template>
+                </el-autocomplete>
+              </el-form-item>
+            </div>
           </div>
+
         </el-form>
         <div class="common-dialog-footer">
           <el-button :loading="buttonLoading" type="primary" @click="submitForm" :disabled="buttonDisabled">提交</el-button>
@@ -322,6 +330,10 @@ onMounted(() => {
   border: 1px solid #dcdfe6; /* 浅灰色边框 */
   padding: 10px; /* 可选：为了美观，可以添加一些内边距 */
   margin-bottom: 10px;
+  width: 800px;
+  background-color: white;
+  border-radius: 5px;
+  box-shadow: 0px 0px 4px rgba(0, 0, 0, .06);
 }
 .highlight-text {
   font-weight: bold; /* 加粗 */

src/views/inspectionWork/inspectorAdd.vue

@@ -87,20 +87,10 @@ const defaultProps = reactive({
 })
 
 const loadNodes = (node, resolve) => {
-  if (!node.data.id) {
-    resolve([{
-      id: 1,
-      isShowSelect: false,
-      label: "广东省",
-      parentLabel: "",
-      personSum: -1,
-    }]);
-  } else {
-    getRegionalTree(node.data.id).then((res) => {
-      resolve(res.data);
-    })
-  }
-
+  node.data.id = !node.data.id ? 0 : node.data.id;
+  getRegionalTree(node.data.id).then((res) => {
+    resolve(res.data);
+  })
 }
 
 // 更新表单数据

src/views/inspectionWork/inspectorEdit.vue

@@ -94,19 +94,10 @@ const fetchDetail = async () => {
 };
 
 const loadNodes = (node, resolve) => {
-  if (!node.data.id) {
-    resolve([{
-      id: 1,
-      isShowSelect: false,
-      label: "广东省",
-      parentLabel: "",
-      personSum: -1,
-    }]);
-  } else {
-    getRegionalTree(node.data.id).then((res) => {
-      resolve(res.data);
-    })
-  }
+  node.data.id = !node.data.id ? 0 : node.data.id;
+  getRegionalTree(node.data.id).then((res) => {
+    resolve(res.data);
+  })
 }
 
 watch(

src/views/inspectionWork/riskManagement.vue

@@ -145,7 +145,7 @@ import { ref, reactive, onMounted, toRefs } from 'vue';
 import { RiskForm, RiskVO } from '@/api/system/user/riskManagement1';
 import { getDicts } from '@/api/system/dict/data';
 import { useRouter } from 'vue-router';
-import { addDateRange2 } from '@/utils/ruoyi';
+import { addDateRange2, parseTime } from '@/utils/ruoyi';
 import { to } from 'await-to-js';
 import { ElMessageBox } from 'element-plus';
 import { addtask, deleteRisk, getRiskDetail, risklist, updatetask } from '@/api/inspectionWork/riskManagement';
@@ -230,6 +230,10 @@ const getList = async () => {
   loading.value = true;
   const res = await risklist(riskForm); //调用列表的接口
   loading.value = false;
+  res.data.forEach((item) => {
+    item.create_time = parseTime(item.create_time);
+  })
+  // res.data.create_time = parseTime(res.data.create_time);
   demoList.value = res.data;
   total.value = res.total;
 };