diff --git a/src/views/companyAdmin/operationLog.vue b/src/views/companyAdmin/operationLog.vue index 0bc9cbe4..7e14702a 100644 --- a/src/views/companyAdmin/operationLog.vue +++ b/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 || - // this.$store.state.userInfo.headquartersSn; + data.sn = data.sn = this.$store.state.userInfo.sn || + 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]; diff --git a/src/views/projectFront/bridgeCraneMonitor/deviceManager.vue b/src/views/projectFront/bridgeCraneMonitor/deviceManager.vue index 4efa573e..2547621b 100644 --- a/src/views/projectFront/bridgeCraneMonitor/deviceManager.vue +++ b/src/views/projectFront/bridgeCraneMonitor/deviceManager.vue @@ -1,15 +1,28 @@ +} +.select-btn { + display: flex; + align-items: center; + justify-content: center; +} +.delete-btn { + display: flex; + align-items: center; + margin-left: 20px; +} +.dark-close { + // color: #F56C6C; +} +.checkbox-list { + display: flex; + flex-wrap: wrap; + margin-left: 260px; + .checkbox-item { + width: 180px; + display: flex; + margin-bottom: 10px; + align-items: center; + /deep/ .el-checkbox__label { + display: inline-block; + } + } +} +.box_3d { + width: 100%; + height: 100%; +} +.nav_box { + display: flex; + // border: 1px solid #eee; + // border-radius: 4px; + background: #efefef; + .nav_item { + width: 60px; + background: #eee; + height: 30px; + line-height: 30px; + text-align: center; + cursor: pointer; + font-size: 16px; + } + .nav_item:nth-child(1) { + border-radius: 3px 0 0 3px; + } + .nav_item:nth-child(2) { + border-radius: 0 3px 3px 0; + } + .active_item { + background: #409eff; + color: #fff; + } +} + \ No newline at end of file diff --git a/src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue b/src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue index 929d7402..a117385f 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..0baf521e 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..54389fd4 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..7573ace2 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..0389a682 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -2314,7 +2314,13 @@ }" @click="getActiveClass(index, item)" > - {{ markTypeNmae(item) }} {{ item.title }} ({{ markTypeLength(item) }}) + {{ + markTypeNmae(item) + }} + {{ item.title }} + ({{ markTypeLength(item) }}) @@ -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(this.certificateList.length == 0) return '未完善'; - const someFlag = this.certificateList.some(item => dayjs(item.effectTime).isSameOrAfter(dayjs(), 'day')) - return someFlag ? '已完善' : '已失效'; - } else if(row.name == 'pact') { - if(this.contractList.length == 0) return '未完善'; - const someFlag = this.contractList.some(item => dayjs(item.contractEndDate).isSameOrAfter(dayjs(), 'day')) - return someFlag ? '已完善' : '已失效'; - } else if(row.name == 'physical') { - if(this.physicalsList.length == 0) return '未完善'; + if (row.name == "credentials") { + if (this.certificateList.length == 0) return "未完善"; + const someFlag = this.certificateList.some((item) => + dayjs(item.effectTime).isSameOrAfter(dayjs(), "day") + ); + return someFlag ? "已完善" : "已失效"; + } else if (row.name == "pact") { + if (this.contractList.length == 0) return "未完善"; + const someFlag = this.contractList.some((item) => + 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(this.certificateList.length == 0) return 'color_ff00'; - const someFlag = this.certificateList.some(item => dayjs(item.effectTime).isSameOrAfter(dayjs(), 'day')) - return someFlag ? 'color_6fb1' : 'color_c8ce'; - }else if(row.name == 'pact') { - if(this.contractList.length == 0) return 'color_ff00'; - const someFlag = this.contractList.some(item => 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'; + if (row.name == "credentials") { + if (this.certificateList.length == 0) return "color_ff00"; + const someFlag = this.certificateList.some((item) => + dayjs(item.effectTime).isSameOrAfter(dayjs(), "day") + ); + return someFlag ? "color_6fb1" : "color_c8ce"; + } else if (row.name == "pact") { + if (this.contractList.length == 0) return "color_ff00"; + const someFlag = this.contractList.some((item) => + 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) { - return this.certificateList.length - } else if(row.name == 'pact') { - return this.contractList.length - } else if(row.name == 'physical') { - return this.physicalsList.length + if (row.name == "credentials" && row.childrenFlag) { + return this.certificateList.length; + } else if (row.name == "pact") { + return this.contractList.length; + } else if (row.name == "physical") { + return this.physicalsList.length; } - return this.certificateList.length + this.contractList.length + this.physicalsList.length; - } + return ( + this.certificateList.length + + this.contractList.length + + this.physicalsList.length + ); + }; }, - } + }, }; @@ -4535,24 +4556,24 @@ export default { .mark_box { font-size: 14px; color: #a2a4af; - .color_ff00{ - color: #FF0000; + .color_ff00 { + color: #ff0000; border-radius: 3px; - border: 1px solid #FF0000; + border: 1px solid #ff0000; padding: 2px 3px; font-size: 8px; } - .color_6fb1{ - color: #6FB172; + .color_6fb1 { + color: #6fb172; border-radius: 3px; - border: 1px solid #6FB172; + border: 1px solid #6fb172; padding: 2px 3px; font-size: 8px; } - .color_c8ce{ - color: #C8CEDD; + .color_c8ce { + color: #c8cedd; border-radius: 3px; - border: 1px solid #C8CEDD; + border: 1px solid #c8cedd; padding: 2px 3px; font-size: 8px; } diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index ef5b5239..417e723a 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/administration1.vue b/src/views/projectFront/laborManage/personModule/administration1.vue index 61ab3d6c..72ab3ad5 100644 --- a/src/views/projectFront/laborManage/personModule/administration1.vue +++ b/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]; diff --git a/src/views/projectFront/laborManage/personModule/laborComponent.vue b/src/views/projectFront/laborManage/personModule/laborComponent.vue index f0913a93..36e913b3 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..d49bee98 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..20d554a6 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) {