diff --git a/src/components/message.vue b/src/components/message.vue index 960a779a..fb7f29b3 100644 --- a/src/components/message.vue +++ b/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) => { diff --git a/src/views/home/login_v3.vue b/src/views/home/login_v3.vue index 81842830..5163448d 100644 --- a/src/views/home/login_v3.vue +++ b/src/views/home/login_v3.vue @@ -137,7 +137,6 @@ - 停用 + {{ scope.row.isEnabled == 1 ? '停用' : '启用'}} @@ -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")); diff --git a/src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue b/src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue index 929d7402..5f65a92f 100644 --- a/src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue +++ b/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; diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue index ec037565..eec57cf4 100644 --- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue +++ b/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) { diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue index 8c03ed9d..a5f36e34 100644 --- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue +++ b/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) { diff --git a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue b/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue index e1c9d935..a1bf39d1 100644 --- a/src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue +++ b/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) { diff --git a/src/views/projectFront/laborManage/laborManageSet.vue b/src/views/projectFront/laborManage/laborManageSet.vue index c3c715fd..25859feb 100644 --- a/src/views/projectFront/laborManage/laborManageSet.vue +++ b/src/views/projectFront/laborManage/laborManageSet.vue @@ -113,6 +113,39 @@ +
+ + + +
+
+ 是否开启人脸录入时的人脸检测识别功能 +
+
+ 保存 +
+ +
+
+
+
+
+
+ 此设置默认开启,关闭此设置后,人员录入时不做人脸检测,人脸采集照片可随意录入。 +
+
+
+
+
@@ -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, diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index d423654e..73911152 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/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"); diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index ef5b5239..8d19d81f 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/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") { diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index f0913a93..1639794a 100644 --- a/src/views/projectFront/laborManage/personModule/laborComponent.vue +++ b/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"); diff --git a/src/views/projectFront/laborManage/personModule/temporary.vue b/src/views/projectFront/laborManage/personModule/temporary.vue index 23dc96c1..30f953f7 100644 --- a/src/views/projectFront/laborManage/personModule/temporary.vue +++ b/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 = diff --git a/src/views/projectFront/laborManage/personRegisterDetails.vue b/src/views/projectFront/laborManage/personRegisterDetails.vue index 75cd1d49..6c9212e5 100644 --- a/src/views/projectFront/laborManage/personRegisterDetails.vue +++ b/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) {