merge dev-jack into shenzhen-dev

package.json

@@ -21,6 +21,7 @@
     "html2canvas": "^1.0.0-rc.7",
     "js-base64": "^3.7.2",
     "js-md5": "^0.7.3",
+    "lrz": "^4.9.41",
     "moment": "^2.29.1",
     "monitorjs_horse": "^2.2.1",
     "mqtt": "^4.2.6",

src/assets/js/api/common/index.js

@@ -0,0 +1,3 @@
+import { post } from '@/assets/js/http'
+
+export const apiUploadImage = data => post('upload/image', data) // 上传图片

src/assets/js/http.js

@@ -43,7 +43,7 @@ if (process.env.NODE_ENV == 'development') {
     // axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
     // 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.125:6023/'; //杨意本地 http/1.1
     // axios.defaults.baseURL = 'http://47.97.202.104:6023/';
     // axios.defaults.baseURL = 'http://124.71.178.44:9500/'; // 星璇
     // axios.defaults.baseURL = 'http://120.196.217.6:7000/';
@@ -243,7 +243,11 @@ export function post(url, params, config) {
                 if (res.data.code == 200) {
                     resolve(res.data);
                 } else {
-                    Message.error(res.data.message);
+                    if (res.data.status !== 'SUCCESS') {
+                        Message.error(res.data.message);
+                    }else{
+                        resolve(res.data);
+                    }
                 }
             })
             .catch(err => {

src/store/index.js

@@ -54,8 +54,8 @@ export default new Vuex.Store({
 
         /* 2022-06-06 */ // tag: 本地测试接口
         // BASEURL:'http://192.168.34.174:6023/',
-        // UPLOADURL: 'http://192.168.34.125:6023/upload/image',
+        UPLOADURL: 'http://192.168.34.125:6023/upload/image',
-        // FILEURL: 'http://192.168.34.125:6023/image/',
+        FILEURL: 'http://192.168.34.125:6023/image/',
         // UPLOADURL:'http://'+"61.190.32.219:9050"+'/upload/image',//正式
         // FILEURL:'http://'+"61.190.32.219:9050"+'/image/',//正式
         ACCOUNTTYPE: ['系统管理员', '企业一级管理员', '企业二级管理员', '企业三级管理员', '项目管理员'], //1系统管理员，2企业管理员账号，3企业区账号，4企业市账号，5项目账号

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

@@ -1889,7 +1889,6 @@ export default {
       checkAllStatus: false,
       webSocket: null,
       instrUmentScreenDialog: false,
-      // umentScreenUrl: require("@/assets/logo.png"),
       umentScreenUrl: './img/logo/' + LOGO_white + '.png',
       base64Type: 'data:image/jpeg;base64,',
       isUploadToHouse: false, //是否显示上传到住建局按钮
@@ -1985,9 +1984,7 @@ export default {
     // 判断是否为深圳项目
     getProjectConfig() {
       getProjectConfigListApi({ projectSn: this.projectSn }).then((res) => {
-        // this.isSzProject = 1
         this.isSzProject = res.result[0].isSzProject //1是 0否
-        // console.log(res.result[0].isSzProject)
       })
     },
     exportM() {
@@ -2004,7 +2001,6 @@ export default {
         userId: this.$store.state.userInfo.userId,
         enterpriseId: this.checkedId
       }).then((res) => {
-        // console.log('下发通行设备',res)
         if (res.code == 200) {
           this.$message({
             message: '操作成功，已在后台下发，请稍后查看！',
@@ -2014,10 +2010,8 @@ export default {
       })
     },
     handleChangeE(file, fileList) {
-      // console.log(file)
       this.fileTemp = file.raw
       if (this.fileTemp) {
-        // console.log(this.fileTemp.type)
         if (
           this.fileTemp.type ==
             'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
@@ -2108,7 +2102,6 @@ export default {
           console.log(res)
           this.enterpriseTreeData = res.result
           this.$nextTick(() => {
-            // this.checkeEnterprise(res.result[0])
             if (this.checkedId) {
               this.$refs['treeNode'].setCurrentKey(this.checkedId.toString())
             } else {
@@ -2329,12 +2322,7 @@ export default {
             }
           })
         })
-        .catch(() => {
+        .catch(error)
-          //   this.$message({
-          //     type: "info",
-          //     message: "已取消删除",
-          //   });
-        })
     },
 
     //新增 人员录入 按钮
@@ -2408,7 +2396,6 @@ export default {
             : ''
           this.showEnterpriseName =
             res.result.length > 0 ? res.result[0].enterpriseName : ''
-          // console.log(res);
           this.getDepartmentList()
           this.getHierarchyEnterpriseList()
         } else {
@@ -2434,38 +2421,8 @@ export default {
         enterpriseId: ''
       }
       this.$refs.multipleTable.bodyWrapper.scrollTop = 0
-      //  getTableData();
     },
 
-    //删除 企业
-    // deleteEnterpriseInfo(value) {
-    //   this.$confirm(
-    //     this.$t("message.laborMange.deleteHint"),
-    //     this.$t("message.laborMange.hint"),
-    //     {
-    //       confirmButtonText: this.$t("message.laborMange.confirm"),
-    //       cancelButtonText: this.$t("message.laborMange.cancel"),
-    //       type: "warning",
-    //     }
-    //   )
-    //     .then(() => {
-    //       let data = {
-    //         projectSn: this.projectSn,
-    //         enterpriseId: value.id,
-    //       };
-    //       deleteEnterprise(data).then((res) => {
-    //         if (res.code == 200) {
-    //           this.$message({
-    //             type: "success",
-    //             message: this.$t("message.laborMange.deleteSuccess"),
-    //           });
-    //           this.getProjectList();
-    //           this.checkedId = "";
-    //         }
-    //       });
-    //     })
-    // },
-
     // 新增 || 编辑  人员录入 保存按钮
     savePersonFn(formName) {
       console.log('企业id', this.checkedId)
@@ -2532,7 +2489,6 @@ export default {
                 this.$message.success(this.$t('message.laborMange.addSuccess'))
                 this.addPersonDialog = false
                 this.resetForm(formName)
-                // this.getDepartmentList();
                 this.getTableData()
               }
             })
@@ -2709,12 +2665,7 @@ export default {
             }
           })
         })
-        .catch(() => {
+        .catch(console.log)
-          // this.$message({
-          //   type: "info",
-          //   message: "已取消删除",
-          // });
-        })
     },
 
     //删除 身份证头像  或 现场采集照片
@@ -2743,92 +2694,6 @@ export default {
         }
       })
       localStorage.setItem('showPersonModule', 2)
-      // this.personDialogTitle = this.$t(
-      //   "message.laborMange.detailsOfManagementPersonnel"
-      // );
-      // this.titleType = "detail";
-      // this.personForm = {
-      //   workerName: "",
-      //   sex: "",
-      //   idCard: "",
-      //   birthday: "",
-      //   enterDate: "",
-      //   nation: "",
-      //   nativePlace: "",
-      //   issuingAuthorityForIdcard: "",
-      //   idCardEndDate: "",
-      //   longTerm: false,
-      //   phoneNumber: "",
-      //   emergentPerson: "",
-      //   emergentPhone: "",
-      //   inserviceType: "",
-      //   politicsStatus: "",
-      //   marry: "",
-      //   payRollBankName: "",
-      //   payRollBankNumber: "",
-      //   educational: "",
-      //   blood: "",
-      //   examinationImage: "",
-      //   contractImage: "",
-      //   employmentCard: "",
-      //   idCardBigPhotoUrl: "",
-      //   fieldAcquisitionUrl: "",
-      //   personType: 1,
-      // };
-      // this.addPersonDialog = true;
-      // this.personForm = value;
-      // this.personForm.sex = String(value.sex);
-      // this.personForm.longTerm = value.longTerm == 1 ? true : false;
-      // this.idCardUpPhotoUrlFile = this.personForm.idCardUpPhotoUrl
-      //   ? [
-      //       {
-      //         name: this.personForm.idCardUpPhotoUrl,
-      //         url: this.personForm.idCardUpPhotoUrl,
-      //       },
-      //     ]
-      //   : [];
-      // this.idCardDownPhotoUrlFile = this.personForm.idCardDownPhotoUrl
-      //   ? [
-      //       {
-      //         name: this.personForm.idCardDownPhotoUrl,
-      //         url: this.personForm.idCardDownPhotoUrl,
-      //       },
-      //     ]
-      //   : [];
-      // this.idCardBigPhotoUrlFile = this.personForm.idCardBigPhotoUrl
-      //   ? [
-      //       {
-      //         name: this.personForm.idCardBigPhotoUrl,
-      //         url: this.personForm.idCardBigPhotoUrl,
-      //       },
-      //     ]
-      //   : [];
-      // this.fieldAcquisitionUrlFile = this.personForm.fieldAcquisitionUrl
-      //   ? [
-      //       {
-      //         name: this.personForm.fieldAcquisitionUrl,
-      //         url: this.personForm.fieldAcquisitionUrl,
-      //       },
-      //     ]
-      //   : [];
-      // //合同原件
-      // let arr2 = value.contractImage != "" && value.contractImage.split(",");
-      // let newArr2 = [];
-      // if (arr2.length > 1) {
-      //   for (let i in arr2) {
-      //     let a = arr2[i].split("*");
-      //     newArr2.push({ name: a[0], url: a[1] });
-      //   }
-      // } else {
-      //   if (value.contractImage != "") {
-      //     let a = arr2[0].split("*");
-      //     newArr2.push({ name: a[0], url: a[1] });
-      //   }
-      // }
-      // this.contractImageFile = value.contractImage != "" ? newArr2 : []; //合同原件
-      // setTimeout(() => {
-      //   this.$refs.personDialog.scrollTop = 0;
-      // }, 120);
     },
 
     //列表数据 退场按钮
@@ -2863,12 +2728,7 @@ export default {
             }
           })
         })
-        .catch(() => {
+        .catch(console.log)
-          // this.$message({
-          //   type: "info",
-          //   message: "已取消",
-          // });
-        })
     },
 
     //切换每页显示数量
@@ -2973,7 +2833,6 @@ export default {
     handleSuccess(file, type, file2) {
       // 人员录入  type ==  1 身份证正面照url 国徽; 2 身份证反面照url 人像; 3 身份证头像; 4 现场采集人脸; 5 合同附件;
       if (file.code == 200 || file.status == 'SUCCESS') {
-        // this.$message.success(this.$t("message.laborMange.uploadSuccessful"));
         let arr = { name: file.data[0].filename, url: file.data[0].imageUrl }
         if (type == 1) {
           this.personForm.idCardUpPhotoUrl = file.data[0].imageUrl
@@ -2998,10 +2857,7 @@ export default {
             } else {
               this.checkFace(file.data[0].imageUrl)
             }
-            // this.checkFace(file.data[0].imageUrl)
           }
-          // this.cropperOption.img = this.$store.state.FILEURL + file.data[0].imageUrl;
-          // this.cropperDialog = true;
         } else if (type == 5) {
           this.contractImageFile.push(arr)
           let arrJoin = []
@@ -3045,7 +2901,6 @@ export default {
             this.personForm.fieldAcquisitionUrl = url
             this.fieldAcquisitionFile = [{ name: '', url: url }]
             this.cropperDialog = false
-            // this.$message.error('未匹配到照片！')
           }
           console.log(res, '-----人员库照片查询')
         }
@@ -3089,7 +2944,6 @@ export default {
               } else {
                 this.checkFace(res.data.data[0].imageUrl)
               }
-              // this.checkFace(res.data.data[0].imageUrl)
             }
           })
       })
@@ -3376,7 +3230,6 @@ export default {
     //保存 并 关闭
     onclose(type) {
       if (type == 1) {
-        // this.webSocket.send("OpenFaceFrame(0)");
         this.webSocket.send('sGetBase64')
       } else if (type == 2) {
         this.webSocket.send('bStopPlay')
@@ -3437,19 +3290,7 @@ export default {
         id: id
       }
       console.log('data', json)
-      updateByIdWorkerInfo(json).then((res) => {
+      updateByIdWorkerInfo(json).then(console.log)
-        // if (res.code == 200) {
-        //   this.$message.success(this.$t("message.laborMange.modifySuccess"));
-        //   this.getTeamList(1);
-        //   this.addPersonDialog = false;
-        //   this.resetForm(formName);
-        //   this.examinationFile = []; //体检报告
-        //   this.contractFile = []; //合同附件
-        //   this.employmentFile = []; //从业资格证书
-        //   this.idCardUpPhotoFile = []; //身份证头像
-        //   this.fieldAcquisitionFile = []; //现场采集人脸
-        // }
-      })
     },
     //身份证识别
     discernId(url, type) {
@@ -3491,7 +3332,6 @@ export default {
   align-items: center;
   .left2 {
     width: 370px;
-    // background: #fbfbfb;
     height: 100%;
     position: relative;
     .placeholder {
@@ -3518,12 +3358,10 @@ export default {
       .list_content::-webkit-scrollbar-thumb {
         /*滚动条里面小方块*/
         border-radius: 5px;
-        // box-shadow: inset 0 0 5px #C1C1C1;
         background: #c1c1c1;
       }
       .list_content::-webkit-scrollbar-track {
         /*滚动条里面轨道*/
-        // box-shadow: inset 0 0 5px #C1C1C1;
         border-radius: 5px;
         background: #f1f1f1;
       }
@@ -3603,7 +3441,6 @@ export default {
 }
 .addPerson_content {
   height: 617px;
-  // overflow-y: auto;
   padding-top: 10px;
 }
 .custom-tree-node {