'2022-3-8'

src/api/secFound.js

@@ -189,3 +189,34 @@ export function verifyDanger(params) {
     params
   })
 }
+
+/**
+ * 上传不符合
+ * enterpriseId
+ * matterId
+ */
+export function postUnSatify(enterpriseId, matterId) {
+  return request({
+    url: 'api/enterpriseSafetyInconformity',
+    method: 'post',
+    data: {
+      enterpriseId,
+      matterId
+    }
+  })
+}
+/**
+ * 上传符合
+ * enterpriseId
+ * matterId
+ */
+export function deleteSatify(enterpriseId, matterId) {
+  return request({
+    url: 'api/enterpriseSafetyInconformity',
+    method: 'delete',
+    data: [{
+      enterpriseId,
+      matterId
+    }]
+  })
+}
\ No newline at end of file

src/router/routers.js

@@ -264,6 +264,20 @@ export const constantRouterMap = [
     hidden: true,
     redirect: 'noredirect',
     children: [
+      {
+        path: 'hdtype',
+        component: hdtype,
+        name: '企业安全管理问题库',
+        meta: { title: '企业安全管理问题库' },
+        hidden: true
+      },
+      {
+        path: 'securityCheck/hdtype',
+        component: hdtype,
+        name: '企业安全管理问题库',
+        meta: { title: '企业安全管理问题库' },
+        hidden: true
+      },
       {
         path: 'securityCheck',
         component: securityCheckHome,

src/views/hiddendanger/index.vue

@@ -60,7 +60,7 @@
               prop="hdInspectExpert"
               width="70"
             />
-            <el-table-column label="隐患名称" prop="hdName" width="360" />
+            <el-table-column label="发现问题" prop="hdName" width="360" />
             <el-table-column label="隐患图片" width="80">
               <template slot-scope="scope1">
                 <el-image
@@ -80,18 +80,14 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="隐患描述" width="140">
+            <el-table-column label="检查依据" width="140">
               <template slot-scope="scope1">
                 <span>{{
-                  scope1.row.hdDesc === "null" ? "" : scope1.row.hdDesc
+                  scope1.row.basis === "null" ? "" : scope1.row.basis
                 }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              label="整改建议"
-              prop="hdRectificationSug"
-              width="220"
-            />
+            <el-table-column label="整改建议" prop="suggestion" width="220" />
             <!-- <el-table-column
               label="隐患照片"
             >
@@ -209,7 +205,7 @@
       :visible.sync="adddialogform"
       :close-on-click-modal="false"
     >
-      <el-form :model="formInfo" v-if="adddialogform">
+      <el-form :model="formInfo" v-if="adddialogform" label-width="120px">
         <el-form-item label="序号">
           <el-input v-model="formInfo.hdOrder" :disabled="true" />
         </el-form-item>
@@ -232,7 +228,21 @@
             <el-option label="重大隐患" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="发现问题">
+        <el-form-item label="安全类别">
+          <el-select v-model="curTotalType" placeholder="请选择安全类别">
+            <el-option
+              key="安全资料类"
+              value="安全资料类"
+              label="安全资料类"
+            ></el-option>
+            <el-option
+              key="现场检查类"
+              value="现场检查类"
+              label="现场检查类"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="安全检查类别">
           <el-select
             v-model="curChosenSecCheckType"
             placeholder="请选择安全检查类别"
@@ -244,6 +254,8 @@
               :label="item.name"
             ></el-option>
           </el-select>
+        </el-form-item>
+        <el-form-item label="安全检查内容">
           <el-select
             v-model="curChosenSecCheckContent"
             placeholder="请选择检查内容"
@@ -255,6 +267,8 @@
               :label="item.name"
             ></el-option>
           </el-select>
+        </el-form-item>
+        <el-form-item label="发现问题">
           <el-select v-model="formInfo.hdName" placeholder="检查内容">
             <el-option
               v-for="item in secCheckDiscover"
@@ -267,11 +281,11 @@
         <el-form-item label="备注">
           <el-input v-model="formInfo.comment" placeholder="备注" />
         </el-form-item>
-        <el-form-item label="隐患描述">
-          <el-input v-model="formInfo.hdDesc" type="textarea" />
+        <el-form-item label="检查依据">
+          <el-input v-model="formInfo.basis" type="textarea" />
         </el-form-item>
         <el-form-item label="整改建议">
-          <el-input v-model="formInfo.hdRectificationSug" type="textarea" />
+          <el-input v-model="formInfo.suggestion" type="textarea" />
         </el-form-item>
         <el-form-item label="">
           <img :src="uploadHdUrl" alt="暂未选择图片" style="width: 60%;" />
@@ -354,7 +368,7 @@
       :visible.sync="editdialogform"
       :close-on-click-modal="false"
     >
-      <el-form :model="formInfo" v-if="editdialogform">
+      <el-form :model="formInfo" v-if="editdialogform" label-width="120px">
         <el-form-item label="序号">
           <el-input v-model="formInfo.hdOrder" :disabled="true" />
         </el-form-item>
@@ -377,7 +391,21 @@
             <el-option label="重大隐患" value="2" />
           </el-select>
         </el-form-item>
-        <el-form-item label="发现问题">
+        <el-form-item label="安全类别">
+          <el-select v-model="curTotalType" placeholder="请选择安全类别">
+            <el-option
+              key="安全资料类"
+              value="安全资料类"
+              label="安全资料类"
+            ></el-option>
+            <el-option
+              key="现场检查类"
+              value="现场检查类"
+              label="现场检查类"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="安全检查类别">
           <el-select
             v-model="curChosenSecCheckType"
             placeholder="请选择安全检查类别"
@@ -389,6 +417,8 @@
               :label="item.name"
             ></el-option>
           </el-select>
+        </el-form-item>
+        <el-form-item label="安全检查内容">
           <el-select
             v-model="curChosenSecCheckContent"
             placeholder="请选择检查内容"
@@ -400,6 +430,8 @@
               :label="item.name"
             ></el-option>
           </el-select>
+        </el-form-item>
+        <el-form-item label="发现问题">
           <el-select v-model="formInfo.hdName" placeholder="检查内容">
             <el-option
               v-for="item in secCheckDiscover"
@@ -412,11 +444,11 @@
         <el-form-item label="备注">
           <el-input v-model="formInfo.comment" />
         </el-form-item>
-        <el-form-item label="隐患描述">
-          <el-input v-model="formInfo.hdDesc" type="textarea" />
+        <el-form-item label="检查依据">
+          <el-input v-model="formInfo.basis" type="textarea" />
         </el-form-item>
         <el-form-item label="整改建议">
-          <el-input v-model="formInfo.hdRectificationSug" type="textarea" />
+          <el-input v-model="formInfo.suggestion" type="textarea" />
         </el-form-item>
         <el-form-item label="隐患图片">
           <img
@@ -553,6 +585,8 @@ import { parseTime } from "@/utils/index.js";
 export default {
   data() {
     return {
+      // 当前选择得安全类别
+      curTotalType: "",
       // 当前选择的安全检查类别
       curChosenSecCheckType: "",
       // 当前选择的安全检查内容
@@ -561,6 +595,8 @@ export default {
       curChosenSecCheckDiscover: "",
       // 安全检查类别
       secCheckType: [],
+      // 安全检查类别2
+      secCheckType2: [],
       // 安全检查内容
       secCheckContent: [],
       // 发现问题
@@ -658,6 +694,7 @@ export default {
           "getEnterpriseSafetyInspectionContent getEnterpriseSafetyInspectionContent"
         );
         this.secCheckType = [...res.content];
+        this.secCheckType2 = [...res.content];
       });
     },
     // 初始化所有隐患信息
@@ -689,7 +726,6 @@ export default {
       ).then(res => {
         // console.log(res, 'woqunimalegebi')
         console.log(res, "什么鬼啊");
-        this.totalElement = res.totalElements;
         replaceArray = [...res.content];
         replaceArray = replaceArray.sort((a, b) => a.companyId - b.companyId);
         for (let i = 0; i < replaceArray.length; i++) {
@@ -1367,6 +1403,26 @@ export default {
         this.secCheckDiscover = [...res.content];
         console.log(res, "getEnterpriseSafetyMatter ,,,,,,,,,,,");
       });
+    },
+    curTotalType(newVal, oldVal) {
+      console.log(newVal, oldVal, "newVal oldVal newVal oldVal newVal oldVal");
+      console.log(this.secCheckType, "hehehehhehehe");
+      // this.secCheckType = this.secCheckType2.filter()
+      this.secCheckType = this.secCheckType2.filter(item => {
+        return item.type === newVal;
+      });
+    },
+    // secCheckDiscover(newVal, oldVal) {
+    //   console.log(newVal, oldVal, "secCheckDiscover secCheckDiscover");
+    //   // this.formInfo.hdDesc
+    // }
+    "formInfo.hdName"(newVal, oldVal) {
+      this.formInfo.hdDesc = this.secCheckDiscover.filter(
+        item => item.name === newVal
+      )[0].basis;
+      this.formInfo.hdRectificationSug = this.secCheckDiscover.filter(
+        item => item.name === newVal
+      )[0].suggestion;
     }
   }
 };