[新增功能](hyx_2024-11-12_newInspect)

安全环保检查同步

config/index.js

@@ -27,7 +27,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '192.168.0.105', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/views/hidden/rectify/components/change.vue

@@ -33,7 +33,7 @@
             <el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
               <el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
             </el-form-item>
-            <el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施"  prop="TEMPORARY_SAFE_MEASURE" >
+            <el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" prop="TEMPORARY_SAFE_MEASURE" >
               <el-input :rows="3" v-model="form.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
             </el-form-item>
             <el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">

src/views/hiddenApi/publicMethod/list.vue

@@ -793,7 +793,7 @@ export default {
           })
           this.loading = false
           return false
-        }else {
+        } else {
           this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = ''
         }
       }

src/views/safetyenvironmental/inspection/components/add.vue

@@ -13,16 +13,16 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--        <el-row :gutter="20">-->
+        <el-row :gutter="20">
-        <!--          <el-col :span="12">-->
+          <el-col :span="12">
-        <!--            <el-form-item label="是否为相关方" prop="IS_XGF">-->
+            <el-form-item label="是否为相关方" prop="IS_XGF">
-        <!--              <el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">-->
+              <el-radio-group id="IS_XGF" ref="IS_XGF" v-model="form.IS_XGF" @change="getXgfTreeData">
-        <!--                <el-radio :label="'1'" >是</el-radio>-->
+                <el-radio :label="'1'" >是</el-radio>
-        <!--                <el-radio :label="'0'" >否</el-radio>-->
+                <el-radio :label="'0'" >否</el-radio>
-        <!--              </el-radio-group>-->
+              </el-radio-group>
-        <!--            </el-form-item>-->
+            </el-form-item>
-        <!--          </el-col>-->
+          </el-col>
-        <!--        </el-row>-->
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="被检查单位" prop="INSPECTED_DEPARTMENT_ID">
@@ -609,7 +609,7 @@ export default {
     getInspectorList(DEPARTMENT_ID, i) {
       if (DEPARTMENT_ID) {
         requestFN(
-          '/user/listAll',
+          '/user/getUserList',
           {
             DEPARTMENT_ID: DEPARTMENT_ID,
             NOMAIN: '1'
@@ -979,7 +979,7 @@ export default {
     getUserList(DEPARTMENT_ID) {
       if (DEPARTMENT_ID) {
         requestFN(
-          '/user/listAll',
+          '/user/getUserList',
           { DEPARTMENT_ID: DEPARTMENT_ID }
         ).then((data) => {
           this.INSPECTED_SITEUSER_List = data.userList
@@ -1090,7 +1090,7 @@ export default {
         })
       } else {
         requestFN(
-          '/user/listAll',
+          '/user/getUserList',
           { DEPARTMENT_ID: DEPARTMENT_ID }
         ).then((data) => {
           this.INSPECTED_SITEUSER_List = data.userList

src/views/safetyenvironmental/inspection/components/info.vue

@@ -10,7 +10,7 @@
             <table class="table-ui">
               <tr>
                 <td class="tbg" width="12%">被检查单位</td>
-                <td width="30%">{{ pd.INSPECTED_DEPARTMENT_NAMES }}</td>
+                <td width="30%">{{ pd.INSPECTED_DEPARTMENT_NAME }}</td>
                 <td class="tbg" width="15%">被检查单位现场负责人</td>
                 <td width="40%">{{ pd.INSPECTED_SITEUSER_NAME }}</td>
               </tr>

src/views/safetyenvironmental/inspection/components/list.vue

@@ -142,7 +142,7 @@
         width="55"
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column prop="INSPECTED_DEPARTMENT_NAMES" label="被检查单位" align="center" />
+      <el-table-column prop="INSPECTED_DEPARTMENT_NAME" label="被检查单位" align="center" />
       <el-table-column prop="INSPECTED_SITEUSER_NAME" label="被检查单位现场负责人" align="center" />
       <el-table-column prop="INSPECTION_DEPARTMENT_NAME" label="检查部门" align="center" />
       <el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" width="120" />

static/config.js

@@ -1,11 +1,12 @@
 // eslint-disable-next-line no-unused-vars
 const config = {
-  weburl: 'http://192.168.0.49:8080/', // 前台地址
+  weburl: 'http://192.168.0.105:8081/', // 前台地址
-  httpurl: 'http://192.168.0.49:8091/', // 后台地址
+  httpurl: 'http://192.168.0.105:8091/', // 后台地址
   qyurl: 'https://qgqy.qhdsafety.com/', // 企业前台
   adminurl: 'https://www.qdkjchina.com/qa-prevention-admin/',
   // 正式
-  fileUrl: 'https://qgqy.qhdsafety.com/file/', // 附件服务器地址
+  // fileUrl: 'https://qgqy.qhdsafety.com/file/', // 附件服务器地址
+  fileUrl: 'http://192.168.192.201:8991/file/', // 附件服务器地址,
   weburlWaiwang: 'https://qgqy.qhdsafety.com/', // 服务器外网地址
   httpurlWaiwang: 'https://qgqy.qhdsafety.com/qa-prevention-gwj/', // ,
   fileUrlWaiwang: 'https://qgqy.qhdsafety.com/file/', //  服务器外网 附件地址,