隐患排查调整

.env.local

@@ -4,7 +4,7 @@ NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径  http://192.168.188.86:48080  https://iot.deepoil.cc:5443  http://172.26.0.56:48080  http://192.168.188.198:48080
-VITE_BASE_URL='https://iot.deepoil.cc:5443'
+VITE_BASE_URL='http://192.168.188.60:48080'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持 S3 服务
 VITE_UPLOAD_TYPE=server

src/utils/dict.ts

@@ -332,7 +332,8 @@ export enum DICT_TYPE {
   QHSE_HAZARD_SOURCE = 'hazard_soure',
   QHSE_DEVICE_CERT_TYPE = 'qhse_device_cert_type',
   QHSE_DETECT_CYCLE = 'detect_cycle',
-  QHSE_TRAIN_CYCLE = 'qhse_train_cycle'
+  QHSE_TRAIN_CYCLE = 'qhse_train_cycle',
+  QHSE_CHECK_TYPE = 'qhse_hazard_type'
 }
 
 export function realValue(type: any, value: string) {

src/views/pms/qhse/safety/index.vue

@@ -10,10 +10,10 @@
             <el-input placeholder="请输入地址" v-model="queryParams.address" />
           </el-form-item>
 
-          <el-form-item label="来源" prop="source">
+          <el-form-item label="检查主体" prop="source">
             <el-select
               v-model="queryParams.source"
-              placeholder="请选择来源"
+              placeholder="请选择检查主体"
               clearable
               style="width: 150px">
               <el-option
@@ -136,12 +136,18 @@
 
           <zm-table-column label="单位" align="center" prop="deptName" />
           <zm-table-column label="类型" align="center" prop="classifyName" />
-          <zm-table-column label="来源" align="center" min-width="90">
+          <zm-table-column label="检查主体" align="center" min-width="90">
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.QHSE_HAZARD_SOURCE" :value="scope.row.source" />
             </template>
           </zm-table-column>
 
+          <zm-table-column label="检查类型" align="center" min-width="90">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.QHSE_CHECK_TYPE" :value="scope.row.checkType" />
+            </template>
+          </zm-table-column>
+
           <zm-table-column label="地点" align="center" prop="address" />
 
           <zm-table-column label="存在问题" align="center" prop="problem" />
@@ -250,10 +256,10 @@
       :rules="formRules"
       label-width="120px"
       v-loading="formLoading">
-      <el-form-item label="隐患排查来源" prop="source">
+      <el-form-item label="检查主体" prop="source">
         <el-select
           v-model="formData.source"
-          placeholder="请选择隐患排查来源"
+          placeholder="请选择检查主体"
           clearable
           @change="handleChange">
           <el-option
@@ -263,6 +269,15 @@
             :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="检查类型" prop="checkType">
+        <el-select v-model="formData.checkType" placeholder="请选择检查类型" clearable>
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.QHSE_CHECK_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="所属队伍" prop="deptId">
         <el-tree-select
           clearable
@@ -276,14 +291,14 @@
           filterable
           placeholder="请选择所属队伍" />
       </el-form-item>
-      <el-form-item label="隐患排查类型" prop="classify">
+      <el-form-item label="隐患类别" prop="classify">
         <el-tree-select
           style="width: 500px; overflow: auto"
           v-model="formData.classify"
           :data="deptTree"
           :props="defaultProps"
           :check-strictly="false"
-          placeholder="请选择隐患排查类型"
+          placeholder="请选择隐患类别"
           value-key="id" />
       </el-form-item>
 
@@ -501,7 +516,8 @@ const formData = ref({
   source: '',
   checkTime: '',
   correctStandard: '',
-  correctPerson: ''
+  correctPerson: '',
+  checkType: ''
 })
 
 // 表单验证规则
@@ -514,10 +530,11 @@ const formRules = {
   rectifyFile: [{ required: true, message: '整改附件不能为空', trigger: 'blur' }],
   hazardFile: [{ required: true, message: '照片不能为空', trigger: 'blur' }],
   classify: [{ required: true, message: '分类不能为空', trigger: 'blur' }],
-  source: [{ required: true, message: '来源不能为空', trigger: 'blur' }],
+  source: [{ required: true, message: '检查主体不能为空', trigger: 'blur' }],
   checkTime: [{ required: true, message: '检查时间不能为空', trigger: 'blur' }],
   correctStandard: [{ required: true, message: '整改标准不能为空', trigger: 'blur' }],
-  correctPerson: [{ required: true, message: '整改人不能为空', trigger: 'blur' }]
+  correctPerson: [{ required: true, message: '整改人不能为空', trigger: 'blur' }],
+  checkType: [{ required: true, message: '检查类型不能为空', trigger: 'blur' }]
 }
 
 /** 查询列表 */