flx:新增劳务人脸识别设置

src/components/message.vue

@@ -217,6 +217,7 @@ export default {
   },
   methods: {
     selectNoticeRemindSound() {
+      if(!this.$store.state.projectSn) return;
       selectNoticeRemindSoundApi({
         projectSn: this.$store.state.projectSn,
       }).then((res) => {

src/views/home/login_v3.vue

@@ -137,7 +137,6 @@
                 </el-input>
               </el-form-item>
               <el-form-item
-                v-if="imageCodeFlag == 3006"
                 style="margin-top: 25px"
                 label=""
                 prop="imgCode"

src/views/projectFront/configManage/notificationRuleSet.vue

@@ -318,10 +318,10 @@
                     @click="onDeactivated(scope.row)"
                     type="text"
                     size="small"
-                    style="color: #ea3941"
+                    :style="scope.row.isEnabled == 1 ? 'color: #ea3941' : ''"
-                    icon="el-icon-remove-outline"
+                    :icon="scope.row.isEnabled == 1 ? 'el-icon-remove-outline' : 'el-icon-video-play'"
                   >
-                    <span style="font-size: 14px">停用</span>
+                    <span style="font-size: 14px">{{ scope.row.isEnabled == 1 ? '停用' : '启用'}}</span>
                   </el-button>
                 </template>
               </el-table-column>
@@ -980,10 +980,9 @@ export default {
   components: { gdMap },
   methods: {
     onDeactivated(row) {
-      if (row.isEnabled != 1) return;
       editEnableMessageDevRuleApi({
         ...row,
-        isEnabled: 0,
+        isEnabled: row.isEnabled == 1 ? 0 : 1,
       }).then((res) => {
         if (res.code == 200) {
           this.$message.success(this.$t("message.projectInfo.saveSuccess"));

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

@@ -3383,7 +3383,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 +3516,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) {
@@ -3529,7 +3529,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 +3538,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/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/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) {