flx:暂存

src/views/companyAdmin/operationLog.vue

@@ -281,10 +281,10 @@ export default {
       let data = this.searchForm;
       data.pageNo = this.pageNo;
       data.pageSize = this.pageSize;
-      // data.sn = this.$store.state.userInfo.sn ||
+      data.sn = data.sn = this.$store.state.userInfo.sn ||
-      //     this.$store.state.userInfo.headquartersSn;
+      this.$store.state.userInfo.headquartersSn || this.$store.state.projectSn;;
       //     data.projectSn = this.$store.state.projectSn;
-      data.sn = this.$store.state.projectSn
+      // data.sn = this.$store.state.projectSn
       if (this.daterange) {
         data.startTime = this.daterange[0];
         data.endTime = this.daterange[1];

src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue

@@ -4357,7 +4357,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if (this.temporaryDialog1 || this.temporaryDialog2) {
             this.personForm.fieldAcquisitionUrl = url;

src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue

@@ -1764,7 +1764,7 @@ export default {
                     background: 'rgba(0, 0, 0, 0.5)'
                   });
 
-                  let data = {fileUrl: imgInfo.imageUrl}
+                  let data = {fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn,}
                   checkfaceHikvisionApi(data).then((res) => {
                     console.log("333333333333333333333")
                     console.log(res)
@@ -2920,7 +2920,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
@@ -2930,7 +2930,7 @@ export default {
               background: 'rgba(0, 0, 0, 0.5)'
             });
 
-            let data = {fileUrl: url}
+            let data = {fileUrl: url, projectSn: this.$store.state.projectSn,}
             checkfaceHikvisionApi(data).then((res) => {
               if(res.code == 200 && res.result.checkType == "1"){
                 if (this.temporaryDialog1 || this.temporaryDialog2) {

src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue

@@ -1631,7 +1631,7 @@ export default {
                     background: 'rgba(0, 0, 0, 0.5)'
                   });
 
-                  let data = {fileUrl: imgInfo.imageUrl}
+                  let data = {fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn,}
                   checkfaceHikvisionApi(data).then((res) => {
                     console.log("333333333333333333333")
                     console.log(res)
@@ -2738,7 +2738,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
@@ -2748,7 +2748,7 @@ export default {
               background: 'rgba(0, 0, 0, 0.5)'
             });
 
-            let data = {fileUrl: url}
+            let data = {fileUrl: url,projectSn: this.$store.state.projectSn,}
             checkfaceHikvisionApi(data).then((res) => {
               if(res.code == 200 && res.result.checkType == "1"){
                 if (this.temporaryDialog1 || this.temporaryDialog2) {

src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue

@@ -1245,7 +1245,7 @@ export default {
                   background: 'rgba(0, 0, 0, 0.5)'
                 });
 
-                let data = {fileUrl: imgInfo.imageUrl}
+                let data = {fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn,}
                 checkfaceHikvisionApi(data).then((res) => {
                   console.log("333333333333333333333")
                   console.log(res)
@@ -2421,7 +2421,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
@@ -2431,7 +2431,7 @@ export default {
               background: 'rgba(0, 0, 0, 0.5)'
             });
 
-            let data = {fileUrl: url}
+            let data = {fileUrl: url,projectSn: this.$store.state.projectSn,}
             checkfaceHikvisionApi(data).then((res) => {
               if(res.code == 200 && res.result.checkType == "1"){
                 if (this.temporaryDialog1 || this.temporaryDialog2) {

src/views/projectFront/laborManage/laborManageSet.vue

@@ -113,6 +113,39 @@
           </el-collapse-item>
         </el-collapse>
       </div>
+      <div>
+        <div class="sidebar_btn">
+          <p class="pageTitle">人员管理设置</p>
+        </div>
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="人脸检测设置" name="2">
+            <div class="collapse-box2">
+              <div class="collapse-box">
+                是否开启人脸录入时的人脸检测识别功能
+              </div>
+              <div>
+                <el-button
+                  size="medium"
+                  type="primary"
+                  @click="editProjectSetting"
+                  >保存</el-button
+                >
+                <div>
+                  <el-switch
+                    v-model="enableWorkerFaceCheck"
+                  ></el-switch>
+                </div>
+              </div>
+            </div>
+            <div class="collapse-box1">
+              <div><i class="el-icon-warning-outline"></i></div>
+              <div>
+                此设置默认开启，关闭此设置后，人员录入时不做人脸检测，人脸采集照片可随意录入。
+              </div>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
   </div>
 </template>
@@ -132,6 +165,10 @@ import {
   getEnterpriseInfoList,
   getEnterpriseTypeList,
 } from "@/assets/js/api/laborPerson";
+import {
+  getProjectConfigListApi,
+  editProjectConfigListApi,
+} from "@/assets/js/api/project.js";
 export default {
   data() {
     return {
@@ -173,6 +210,7 @@ export default {
       teamListData: [],
       departmentListData: [],
       projectChilderUserList: [],
+      enableWorkerFaceCheck: false,
     };
   },
   created() {
@@ -182,9 +220,35 @@ export default {
     this.getTeamList();
     this.getDepartmentList();
     this.getUpdatePersonListFn();
+    this.getProjectSetting();
   },
   mounted() {},
   methods: {
+    //获取项目配置信息
+    getProjectSetting() {
+      getProjectConfigListApi({
+        projectSn: this.$store.state.projectSn,
+      }).then((res) => {
+        console.log(res);
+        if (res.code == 200 && res.result.length > 0) {
+          console.log(112233, res.result)
+          this.enableWorkerFaceCheck =
+            res.result[0].enableWorkerFaceCheck == 1 ? true : false;
+        }
+      });
+    },
+    //编辑项目配置信息
+    editProjectSetting() {
+      editProjectConfigListApi({
+        projectSn: this.$store.state.projectSn,
+        enableWorkerFaceCheck: this.enableWorkerFaceCheck ? 1 : 0,
+      }).then((res) => {
+         if(res.code == 200) {
+          this.$message.success(this.$t("message.highModulus.saveSuccessMsg"));
+          this.getProjectSetting();
+         }
+      });
+    },
     getXzSecurityDangerReviewVerifyList() {
       getWorkerExitConfigListApi({
         sn: this.projectSn,

src/views/projectFront/laborManage/personDetails.vue

@@ -2314,7 +2314,13 @@
           }"
           @click="getActiveClass(index, item)"
         >
-          <span v-if="item.childrenFlag" :class="markTypeColor(item)">{{ markTypeNmae(item) }}</span> {{ item.title }} <span v-if="item.childrenFlag || item.name == 'credentials'">({{ markTypeLength(item) }})</span>
+          <span v-if="item.childrenFlag" :class="markTypeColor(item)">{{
+            markTypeNmae(item)
+          }}</span>
+          {{ item.title }}
+          <span v-if="item.childrenFlag || item.name == 'credentials'"
+            >({{ markTypeLength(item) }})</span
+          >
         </div>
       </div>
     </div>
@@ -3383,7 +3389,7 @@ export default {
                   background: "rgba(0, 0, 0, 0.5)",
                 });
 
-                let data = { fileUrl: imgInfo.imageUrl };
+                let data = { fileUrl: imgInfo.imageUrl, projectSn: this.$store.state.projectSn, };
                 checkfaceHikvisionApi(data)
                   .then((res) => {
                     console.log("333333333333333333333");
@@ -3516,7 +3522,10 @@ export default {
     checkFace(url) {
       console.log("url", url);
 
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({
+        fileUrl: url,
+        projectSn: this.$store.state.projectSn,
+      }).then((res) => {
         console.log("res数据", res);
 
         if (res.result.checkType == 1) {
@@ -3529,7 +3538,7 @@ export default {
     },
     //人脸监测、第二版
     checkFace2(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if (this.isIscDevice) {
             const loading = this.$loading({
@@ -3538,7 +3547,7 @@ export default {
               spinner: "el-icon-loading",
               background: "rgba(0, 0, 0, 0.5)",
             });
-            let data = { fileUrl: url };
+            let data = { fileUrl: url, projectSn: this.$store.state.projectSn, };
             checkfaceHikvisionApi(data)
               .then((res) => {
                 console.log("7777777777777777777777");
@@ -4339,51 +4348,63 @@ export default {
   computed: {
     markTypeNmae() {
       return (row) => {
-        if(row.name == 'credentials') {
+        if (row.name == "credentials") {
-          if(this.certificateList.length == 0) return '未完善';
+          if (this.certificateList.length == 0) return "未完善";
-          const someFlag = this.certificateList.some(item => dayjs(item.effectTime).isSameOrAfter(dayjs(), 'day'))
+          const someFlag = this.certificateList.some((item) =>
-          return someFlag ? '已完善' : '已失效';
+            dayjs(item.effectTime).isSameOrAfter(dayjs(), "day")
-        } else if(row.name == 'pact') {
+          );
-          if(this.contractList.length == 0) return '未完善';
+          return someFlag ? "已完善" : "已失效";
-          const someFlag = this.contractList.some(item => dayjs(item.contractEndDate).isSameOrAfter(dayjs(), 'day'))
+        } else if (row.name == "pact") {
-          return someFlag ? '已完善' : '已失效';
+          if (this.contractList.length == 0) return "未完善";
-        } else if(row.name == 'physical') {
+          const someFlag = this.contractList.some((item) =>
-          if(this.physicalsList.length == 0) return '未完善';
+            dayjs(item.contractEndDate).isSameOrAfter(dayjs(), "day")
+          );
+          return someFlag ? "已完善" : "已失效";
+        } else if (row.name == "physical") {
+          if (this.physicalsList.length == 0) return "未完善";
           // const someFlag = this.physicalsList.some(item => dayjs(item.contractEndDate).isSameOrAfter(dayjs(), 'day'))
-          return '已完善';
+          return "已完善";
         }
-      }
+      };
     },
     markTypeColor() {
       return (row) => {
-        if(row.name == 'credentials') {
+        if (row.name == "credentials") {
-          if(this.certificateList.length == 0) return 'color_ff00';
+          if (this.certificateList.length == 0) return "color_ff00";
-          const someFlag = this.certificateList.some(item => dayjs(item.effectTime).isSameOrAfter(dayjs(), 'day'))
+          const someFlag = this.certificateList.some((item) =>
-          return someFlag ? 'color_6fb1' : 'color_c8ce';
+            dayjs(item.effectTime).isSameOrAfter(dayjs(), "day")
-        }else if(row.name == 'pact') {
+          );
-          if(this.contractList.length == 0) return 'color_ff00';
+          return someFlag ? "color_6fb1" : "color_c8ce";
-          const someFlag = this.contractList.some(item => dayjs(item.contractEndDate).isSameOrAfter(dayjs(), 'day'))
+        } else if (row.name == "pact") {
-          return someFlag ? 'color_6fb1' : 'color_c8ce';
+          if (this.contractList.length == 0) return "color_ff00";
-        } else if(row.name == 'physical') {
+          const someFlag = this.contractList.some((item) =>
-          if(this.physicalsList.length == 0) return 'color_ff00';
+            dayjs(item.contractEndDate).isSameOrAfter(dayjs(), "day")
+          );
+          return someFlag ? "color_6fb1" : "color_c8ce";
+        } else if (row.name == "physical") {
+          if (this.physicalsList.length == 0) return "color_ff00";
           // const someFlag = this.physicalsList.some(item => dayjs(item.contractEndDate).isSameOrAfter(dayjs(), 'day'))
-          return 'color_6fb1';
+          return "color_6fb1";
         }
-      }
+      };
     },
     markTypeLength() {
       return (row) => {
-        if(row.name == 'credentials' && row.childrenFlag) {
+        if (row.name == "credentials" && row.childrenFlag) {
-         return this.certificateList.length
+          return this.certificateList.length;
-        } else if(row.name == 'pact') {
+        } else if (row.name == "pact") {
-          return this.contractList.length
+          return this.contractList.length;
-        } else if(row.name == 'physical') {
+        } else if (row.name == "physical") {
-          return this.physicalsList.length
+          return this.physicalsList.length;
         }
-        return this.certificateList.length + this.contractList.length + this.physicalsList.length;
+        return (
-      }
+          this.certificateList.length +
+          this.contractList.length +
+          this.physicalsList.length
+        );
+      };
     },
-  }
+  },
 };
 </script>
 
@@ -4535,24 +4556,24 @@ export default {
   .mark_box {
     font-size: 14px;
     color: #a2a4af;
-    .color_ff00{
+    .color_ff00 {
-      color: #FF0000;
+      color: #ff0000;
       border-radius: 3px;
-      border: 1px solid #FF0000;
+      border: 1px solid #ff0000;
       padding: 2px 3px;
       font-size: 8px;
     }
-    .color_6fb1{
+    .color_6fb1 {
-      color: #6FB172;
+      color: #6fb172;
       border-radius: 3px;
-      border: 1px solid #6FB172;
+      border: 1px solid #6fb172;
       padding: 2px 3px;
       font-size: 8px;
     }
-    .color_c8ce{
+    .color_c8ce {
-      color: #C8CEDD;
+      color: #c8cedd;
       border-radius: 3px;
-      border: 1px solid #C8CEDD;
+      border: 1px solid #c8cedd;
       padding: 2px 3px;
       font-size: 8px;
     }

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

@@ -2898,7 +2898,7 @@ export default {
                   background: "rgba(0, 0, 0, 0.5)",
                 });
 
-                let data = { fileUrl: imgInfo.imageUrl };
+                let data = { fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn, };
                 checkfaceHikvisionApi(data)
                   .then((res) => {
                     if (res.code == 200 && res.result.checkType == "1") {
@@ -4078,7 +4078,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if (this.isIscDevice) {
             const loading = this.$loading({
@@ -4087,7 +4087,7 @@ export default {
               spinner: "el-icon-loading",
               background: "rgba(0, 0, 0, 0.5)",
             });
-            let data = { fileUrl: url };
+            let data = { fileUrl: url,projectSn: this.$store.state.projectSn, };
             checkfaceHikvisionApi(data)
               .then((res) => {
                 if (res.code == 200 && res.result.checkType == "1") {

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

@@ -3242,7 +3242,7 @@ export default {
           this.personForm.idCardBigPhotoUrl = obj.url;
           this.idCardUpPhotoFile = [obj];
         } else if (type == 7) {
-          checkFaceApi({fileUrl:obj.url}).then(res=>{
+          checkFaceApi({fileUrl:obj.url, projectSn: this.$store.state.projectSn,}).then(res=>{
             if(res.result.checkType==1){
               this.personForm.fieldAcquisitionUrl = obj.url;
               this.fieldAcquisitionFile = [obj];

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

@@ -3172,7 +3172,7 @@ export default {
                   background: "rgba(0, 0, 0, 0.5)",
                 });
 
-                let data = { fileUrl: imgInfo.imageUrl };
+                let data = { fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn, };
                 // let token = this.$store.state.userInfo.token
                 // checkfaceHikvisionApi(data,token).then((res) => {
                 checkfaceHikvisionApi(data)
@@ -4816,7 +4816,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if (this.isIscDevice) {
             const loading = this.$loading({
@@ -4825,7 +4825,7 @@ export default {
               spinner: "el-icon-loading",
               background: "rgba(0, 0, 0, 0.5)",
             });
-            let data = { fileUrl: url };
+            let data = { fileUrl: url,projectSn: this.$store.state.projectSn, };
             checkfaceHikvisionApi(data)
               .then((res) => {
                 console.log("7777777777777777777777");

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

@@ -848,7 +848,7 @@ export default {
     },
     //人脸监测、
     checkFace(url) {
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         if (res.result.checkType == 1) {
           if(this.isIscDevice){
             const loading = this.$loading({
@@ -857,7 +857,7 @@ export default {
               spinner: 'el-icon-loading',
               background: 'rgba(0, 0, 0, 0.5)'
             });
-            let data = {fileUrl: url}
+            let data = {fileUrl: url,projectSn: this.$store.state.projectSn,}
             checkfaceHikvisionApi(data).then((res) => {
               if(res.code == 200 && res.result.checkType == "1"){
                 if (this.temporaryDialog1 || this.temporaryDialog2) {
@@ -974,7 +974,7 @@ export default {
                   background: 'rgba(0, 0, 0, 0.5)'
                 });
 
-                let data = {fileUrl: imgInfo.imageUrl}
+                let data = {fileUrl: imgInfo.imageUrl,projectSn: this.$store.state.projectSn,}
                 checkfaceHikvisionApi(data).then((res) => {
                   if(res.code == 200 && res.result.checkType == "1"){
                     this.cropperOption.img =

src/views/projectFront/laborManage/personRegisterDetails.vue

@@ -2635,7 +2635,7 @@ export default {
     checkFace(url) {
       console.log("url", url);
 
-      checkFaceApi({ fileUrl: url }).then((res) => {
+      checkFaceApi({ fileUrl: url, projectSn: this.$store.state.projectSn, }).then((res) => {
         console.log("res数据", res);
 
         if (res.result.checkType == 1) {