admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx:暂存

Browse Source
This commit is contained in:
Rain_ 2025-09-12 15:03:33 +08:00
parent 23051d8838
commit b4d3828e14
13 changed files with 2651 additions and 3279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/companyAdmin/operationLog.vue
View File

@ -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];

5703
src/views/projectFront/bridgeCraneMonitor/deviceManager.vue
View File

File diff suppressed because it is too large Load Diff

2
src/views/projectFront/laborManage/components/comboForm/comboForm copy.vue
View File

@ -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;

6
src/views/projectFront/laborManage/components/comboForm/dialogPage/adminDialog.vue
View File

@ -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) {

6
src/views/projectFront/laborManage/components/comboForm/dialogPage/laborDialog.vue
View File

@ -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) {

6
src/views/projectFront/laborManage/components/comboForm/dialogPage/temporaryDialog.vue
View File

@ -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) {

64
src/views/projectFront/laborManage/laborManageSet.vue
View File

@ -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,

115
src/views/projectFront/laborManage/personDetails.vue
View File

@ -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(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
);
};
},
}
},
};
</script>
@ -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;
}

6
src/views/projectFront/laborManage/personModule/administration.vue
View File

@ -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") {

2
src/views/projectFront/laborManage/personModule/administration1.vue
View File

@ -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];

6
src/views/projectFront/laborManage/personModule/laborComponent.vue
View File

@ -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");

6
src/views/projectFront/laborManage/personModule/temporary.vue
View File

@ -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 =

2
src/views/projectFront/laborManage/personRegisterDetails.vue
View File

@ -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) {