企业后台(安全检查):检查表检查项新增

src/assets/js/api/dangerousBigProject.js

@@ -28,6 +28,8 @@ export const editinspectTableLibraryApi = data => post('xmgl/inspectTableLibrary
 export const selectTableItemListApi = data => post('xmgl/inspectTableItem/selectTableItemList', data); 
 export const deleteTableItemListApi = data => post('xmgl/inspectTableItem/delete', data); 
 export const editTableItemListApi = data => post('xmgl/inspectTableItem/edit', data); 
+export const addTableItemListApi = data => post('xmgl/inspectTableCheckItem/add',data);//新增检查项
+export const addinspectTableApi = data => post('xmgl/inspectTableItem/add',data);//新增检查表
 
 //检查表记录
 export const selectTableCheckItemListApi = data => post('xmgl/inspectTableCheckItem/selectTableItemList', data); 

src/assets/js/http.js

@@ -41,7 +41,7 @@ if (process.env.NODE_ENV == 'development') {
   // tag: 本地
   // axios.defaults.baseURL = 'http://192.168.34.174:6023/'  // 老大本地
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
-  // axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
+  axios.defaults.baseURL = 'http://192.168.34.216:6023/' // 邱平毅本地
   // axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上
   // axios.defaults.baseURL = 'http://192.168.34.125:6023/' //杨意本地 http/1.1
   // axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上
@@ -50,7 +50,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
   // axios.defaults.baseURL = 'http://139.9.66.234:8/';
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
-  axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
+  // axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
   // axios.defaults.baseURL = 'http://120.196.217.6:7000/'  //鹤洲
 
   // axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //

src/store/index.js

@@ -45,8 +45,8 @@ export default new Vuex.Store({
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
     BASEURL: baseUrl ? baseUrl : window.location.protocol + '//' + window.location.host + '/', //
-    // UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
+    UPLOADURL: window.location.protocol + '//' + window.location.host + '/upload/image', //
-    // FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
+    FILEURL: window.location.protocol + '//' + window.location.host + '/image/', //测试 // tag: 本地测试接口
     /* 2022-05-16 */
     // tag: 部署河南项目时，需要打开这两行代码
     // UPLOADURL: 'http://124.71.178.44:100/upload/image',
@@ -56,8 +56,8 @@ export default new Vuex.Store({
     // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
     // FILEURL: 'http://182.90.224.237:7000/image/',
     // 邱平毅的
-    UPLOADURL: 'http://192.168.34.216:6023/upload/image',
+    // UPLOADURL: 'http://192.168.34.216:6023/upload/image',
-    FILEURL: 'http://192.168.34.216:6023/image/',
+    // FILEURL: 'http://192.168.34.216:6023/image/',
 
     // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
     // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式

src/views/projectFront/dangerousBigProject/checkTable.vue

@@ -190,6 +190,15 @@
             >
               添加检查表
             </el-button> -->
+            <el-button
+              type="primary"
+              plain
+              size="small"
+              style="float: right; margin: -2px 15px 0 0"
+              @click="addChecklist"
+            >
+              新增检查表
+            </el-button>
             <el-button
               type="primary"
               plain
@@ -284,10 +293,19 @@
           @click="
             loadRigthtList();
             showItemDetails = false;
-          " style=""
+          " style="display:inline-block;"
         >
           <i class="el-icon-back"></i>{{ dialogdata.tableName }}
         </div>
+        <el-button
+              type="primary"
+              plain
+              size="small"
+              style="float: right; margin: -2px 30px 0 0"
+              @click="addCheckitems"
+            >
+              新增检查项
+            </el-button>
         <div class="table_box" style="margin: 13px">
           <el-table height="652px" :data="itemDetailsData" class="tables">
             <el-table-column
@@ -354,6 +372,76 @@
         </div>
       </div>
     </div>
+    <!-- 新增检查表弹窗 -->
+    <el-dialog
+      class="dialig"
+      :modal-append-to-body="false"
+      :title="'新增检查表'"
+      :visible.sync="addTable"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          ref="addCheckTable"
+          :model="addCheckTable"
+          label-width="120px"
+          :rules="addCheckTableRules"
+          size="medium"
+          class="dialogFormBox"
+        >
+          <el-form-item label="检查表名称" prop="tableName">
+            <el-input
+              v-model="addCheckTable.tableName"
+              placeholder="请输入"
+              type="textarea"
+              autosize
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="创建时间" prop="createTime">
+            <el-date-picker
+              v-model="addCheckTable.createTime"
+              type="datetime"
+              placeholder="选择日期时间"
+              value-format="yyyy-MM-dd HH:mm:ss">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="选项结果" prop="optionResult">
+            <el-select v-model="addCheckTable.optionResult"
+             placeholder="请选择">
+              <el-option 
+                v-for="item in resultList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="addCheckTable.remark"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              @click="addTable = false"
+              size="medium"
+              icon="el-icon-circle-close"
+              >取 消</el-button
+            >
+            <el-button
+              type="primary"
+              @click="addCheckTableSave('addCheckTable')"
+              :loading="isloading"
+              size="medium"
+              icon="el-icon-circle-check"
+              >确 定</el-button
+            >
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
     <el-dialog
       class="dialig"
       :modal-append-to-body="false"
@@ -459,7 +547,7 @@
     <el-dialog
       class="dialig"
       :modal-append-to-body="false"
-      :title="'编辑检查信息'"
+      :title="itemTitle"
       :visible.sync="TableCheckDialog"
       width="667px"
     >
@@ -536,7 +624,10 @@ import {
   selectTableCheckItemListApi,
   deleteTableCheckItemListApi,
   editTableCheckItemListApi,
+  addTableItemListApi,
+  addinspectTableApi
 } from "@/assets/js/api/dangerousBigProject";
+import { title } from "process";
 export default {
   data() {
     return {
@@ -550,6 +641,7 @@ export default {
       threeData: [],
       //   editId: "",
       title: "",
+      itemTitle:"",
       dialogdata: {
         code: "",
         remark: "",
@@ -578,10 +670,32 @@ export default {
       itemDetailsData: [],
       TableCheckItem:{},
       TableCheckDialog: false,
+      tableId:'',
       TableCheckItemRules:{
           checkItem: [{ required: true, message: "必填", trigger: "blur" }],
           checkContent: [{ required: true, message: "必填", trigger: "blur" }],
           checkDetailContent: [{ required: true, message: "必填", trigger: "blur" }],
+      },
+      addCheckTable:{},
+      addTable:false,
+      resultList:[
+        {
+          id:1,
+          value:'1-符合'
+        },
+        {
+          id:2,
+          value:'2-基本符合'
+        },
+        {
+          id:3,
+          value:'3-不符合'
+        },
+
+      ],
+      addCheckTableRules:{
+        checkItem: [{ required: true, message: "必填", trigger: "blur" }],
+        createTime: [{ required: true, message: "必填", trigger: "blur" }],
       }
     };
   },
@@ -605,6 +719,24 @@ export default {
         this.$message.error("导入失败！");
       }
     },
+    // 新增检查表 
+    addChecklist(){
+      this.addTable = true;
+      this.addCheckTable= {}
+    },
+    // 确定按钮
+    addCheckTableSave(){
+      let data = this.addCheckTable
+      data.creatorUser = this.$store.state.userInfo.userId
+      data.classifyId = this.leftId
+      addinspectTableApi(data).then((res)=>{
+        if(res.code == 200 ){
+          this.$message.success("添加成功！");
+          this.loadRigthtList()
+        }
+        this.addTable = false;
+      })
+    },
     downloadFn() {
       // console.loh(this.$http.defaults.baseURL)
       window.location.href =
@@ -699,6 +831,7 @@ export default {
       });
     },
     showTableDetailFn(data) {
+      this.tableId = data.id
       this.dialogdata = data;
       this.showItemDetails = true;
       this.$nextTick(()=>{
@@ -858,10 +991,6 @@ export default {
         }
       );
     },
-    editCheckItem(item){
-        this.TableCheckItem=item;
-        this.TableCheckDialog=true
-    },
     delCheckItem(obj){
         this.$confirm(
         this.$t("message.personnelPosition.beaconManage.table.confirmText") +
@@ -887,16 +1016,39 @@ export default {
         });
       });
     },
+    // 添加检查项
+    addCheckitems(){
+      this.TableCheckDialog = true;
+      this.itemTitle = '添加检查项';
+      this.TableCheckItem = {}
+    },
+    // 编辑检查项
+    editCheckItem(item){
+        this.TableCheckItem=item;
+        this.TableCheckDialog=true;
+        this.itemTitle = '编辑检查项'
+    },
     editTableCheckSave(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          if(this.itemTitle =='添加检查项'){
+            let data  = this.TableCheckItem
+            data.tableId = this.tableId
+            addTableItemListApi(data).then((res)=>{
+              if(res.code == 200){
+                this.$message.success("新增成功！");
+                this.getCheckItem()
+              }
+              this.TableCheckDialog = false;
+            })
+          }else{
             editTableCheckItemListApi(this.TableCheckItem).then((res) => {
                 // this.isloading = false;
                 this.TableCheckDialog = false;
                 this.getCheckItem();
                 this.$message.success("更新成功！");
               });
-            
+          }   
         } else {
           console.log("error submit!!");
           return false;

src/views/projectFront/laborManage/personModule/laborComponent.vue

@@ -2329,6 +2329,7 @@ export default {
     },
     handleSuccessE(file) {
       this.refreshPage = false
+      console.log('==========',file)
       if(file.code == 200){
         this.$message.success(this.$t('message.laborMange.hint6')) //导入成功
         this.refreshBtn()