From 5353c9d16a7779aded4b8556a01a0a489062c634 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Fri, 22 Aug 2025 18:04:55 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BF=AE=E5=A4=8Dbug=20=E6=96=B0=E9=87=91?= =?UTF-8?q?=E6=B9=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/laborManage/screen-icon.png | Bin 0 -> 247 bytes .../laborManage/allAttendanceManage.vue | 16 ++ .../dayAttendanceReport.vue | 4 +- .../enterpriseTreeLeft.vue | 2 + .../punchCardRecord.vue | 11 ++ .../personModule/administration.vue | 61 ++++++-- .../personModule/attendanceRecord.vue | 144 ++++++++++++++---- .../personModule/laborComponent.vue | 42 ++++- .../personModule/laborPersonCommon.less | 4 +- 9 files changed, 233 insertions(+), 51 deletions(-) create mode 100644 src/assets/images/laborManage/screen-icon.png diff --git a/src/assets/images/laborManage/screen-icon.png b/src/assets/images/laborManage/screen-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c26f6484ba46ad2c536b209e5561fcdd32dc5e1d GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ydl>XLn;{8Oz0JKFyLvus*;l= z;8IDDGpYD30p sivQ~w85sWm-?UjQ80c;`kh_@~Hk>e3y!FN42~dQ=)78&qol`;+0DweYM*si- literal 0 HcmV?d00001 diff --git a/src/views/projectFront/laborManage/allAttendanceManage.vue b/src/views/projectFront/laborManage/allAttendanceManage.vue index 86071a7e..5fb22470 100644 --- a/src/views/projectFront/laborManage/allAttendanceManage.vue +++ b/src/views/projectFront/laborManage/allAttendanceManage.vue @@ -21,18 +21,34 @@ style="width: 100%; height: calc(100% - 49px)" > --> diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue index 3a31e31d..23259bb0 100644 --- a/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue +++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/dayAttendanceReport.vue @@ -470,7 +470,7 @@ export default { tableData: [], countWorkerDailyInfo: [ { - title: "当日进场", + title: "当然在职", countNum: 0, content: "当日在职人数之和", }, @@ -674,7 +674,7 @@ export default { // res.result this.countWorkerDailyInfo = [ { - title: "当日进场", + title: "当然在职", countNum: res.result.inServiceCount, content: "当日在职人数之和", }, diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/enterpriseTreeLeft.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/enterpriseTreeLeft.vue index ebdfc69c..43b9f91d 100644 --- a/src/views/projectFront/laborManage/allAttendanceManageComponents/enterpriseTreeLeft.vue +++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/enterpriseTreeLeft.vue @@ -78,6 +78,8 @@ > ({{ data.children.length }})({{ data.workerNum || 0 }}) diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue index 454de8e3..b09545e5 100644 --- a/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue +++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/punchCardRecord.vue @@ -580,8 +580,19 @@ export default { // startDate: this.exportSettingInfo.startDate[0], // endDate: this.exportSettingInfo.startDate[1], projectSn: this.projectSn, + inserviceType: 1, + workerName: this.queryParams.workerName, + startTime: this.queryParams.constructionTime[0], + endTime: this.queryParams.constructionTime[1], idList: this.$refs.multipleTable.selection.map((item) => item.id), }; + const categoryObj = { + 1: "enterpriseId", + 2: "departmentId", + 3: "teamId", + }; + requestData[categoryObj[this.riskListDetail.category]] = + this.riskListDetail.originalId || ""; fetch( this.$http.defaults.baseURL + "xmgl/workerAttendance/exportXls", { diff --git a/src/views/projectFront/laborManage/personModule/administration.vue b/src/views/projectFront/laborManage/personModule/administration.vue index dcddd5a0..61254392 100644 --- a/src/views/projectFront/laborManage/personModule/administration.vue +++ b/src/views/projectFront/laborManage/personModule/administration.vue @@ -130,8 +130,7 @@ + >
特殊工种 @@ -267,11 +266,12 @@ v-if="showTeamList && teamListData.totalDepartmentNum > 0" style=" position: absolute; - right: 10px; - top: 35%; - font-size: 26px; + right: 4px; + top: 50%; + font-size: 20px; cursor: pointer; color: #999; + transform: translateY(-50%); " >
@@ -1492,6 +1492,23 @@ + + + + + + + @@ -2296,6 +2313,7 @@ import { getDangongWorkerFaceStatusPageList, xmglXzHikvisionSyncRetryAPI, checkfaceHikvisionApi, + getWorkerAttendanceGroupV2ListApi, } from "@/assets/js/api/laborPerson"; import { selectUserDevAuthorityByUserIdApi } from "@/assets/js/api/configManage"; import { getProjectConfigListApi } from "@/assets/js/api/project.js"; @@ -2436,6 +2454,7 @@ export default { locationCardno: "", personMail: "", workerNature: "", + attendanceGroupV2Id: "", }, //人员录入校验 personFormRules: this.$t("message.laborMange.personFormRules"), @@ -2525,6 +2544,7 @@ export default { topicName: "topic", userId: "", workerNatureList: [], + workerAttendanceGroupList: [], }; }, created() { @@ -2560,6 +2580,7 @@ export default { this.getUGroupDevList(); this.getProjectConfig(); this.getWorkerNatureList(); + this.getWorkerAttendanceGroupV2List(); }, beforeDestroy() { if (client) { @@ -2584,6 +2605,16 @@ export default { }, }, methods: { + getWorkerAttendanceGroupV2List() { + getWorkerAttendanceGroupV2ListApi({ + projectSn: this.$store.state.projectSn, + // ruleIdIsNullOrRuleId: 1, + }).then((res) => { + if (res.code == 200) { + this.workerAttendanceGroupList = res.result; + } + }); + }, getSpecialWorkerTypeList() { getWorkerTypeList({ projectSn: this.projectSn, @@ -3279,6 +3310,7 @@ export default { ufaceDevGroupId: [], personSerial: "", workerNature: "", + attendanceGroupV2Id: "", enterDate: dayjs().format("YYYY-MM-DD"), }; if (this.attendRulesList.length > 0) { @@ -3530,6 +3562,7 @@ export default { ufaceDevGroupId: [], personSerial: "", workerNature: "", + attendanceGroupV2Id: "", }; this.getUfaceDevList(); // this.goTwo() @@ -4418,7 +4451,7 @@ export default { display: flex; .header_box1 { font-size: 14px; - color: #272D45; + color: #272d45; margin-right: 50px; > span { margin-right: 13px; @@ -4426,7 +4459,7 @@ export default { } .header_box { display: flex; - color: #272D45; + color: #272d45; font-weight: 400; font-size: 14px; margin-right: 30px; @@ -4595,13 +4628,13 @@ export default { width: 90%; padding-right: 10px; box-sizing: border-box; - > span { - width: 100%; - overflow: hidden; - white-space: nowrap; - text-overflow: ellipsis; - text-align: left; - } + > span { + width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + text-align: left; + } } /deep/ .el-tree-node__content { diff --git a/src/views/projectFront/laborManage/personModule/attendanceRecord.vue b/src/views/projectFront/laborManage/personModule/attendanceRecord.vue index de0332f6..26ff078d 100644 --- a/src/views/projectFront/laborManage/personModule/attendanceRecord.vue +++ b/src/views/projectFront/laborManage/personModule/attendanceRecord.vue @@ -21,6 +21,7 @@
- + 上下午打卡 进出场打卡
日期
- +
+
@@ -121,10 +122,17 @@ show-overflow-tooltip > @@ -147,10 +160,17 @@ show-overflow-tooltip > @@ -169,7 +196,9 @@