From 126365f2af9b2df72f79071857695ff10c9e5ebd Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 30 Sep 2023 23:04:00 +0800 Subject: [PATCH] update code --- src/api/attendance/index.js | 10 +- .../components/AttendanceDetailDialog.vue | 131 ++++++++++++++++++ src/pages/components/ProblemmodifyDetail.vue | 106 ++++++++------ src/pages/index.vue | 17 ++- src/pages/progress/indexDlg3.vue | 26 ++-- src/pages/projectProgress.vue | 2 +- src/pages/style/index.less | 20 +++ 7 files changed, 249 insertions(+), 63 deletions(-) create mode 100644 src/pages/components/AttendanceDetailDialog.vue diff --git a/src/api/attendance/index.js b/src/api/attendance/index.js index 769eed7..578b3a4 100644 --- a/src/api/attendance/index.js +++ b/src/api/attendance/index.js @@ -23,8 +23,16 @@ const groupByComany=(data)=> { method: 'post' }) } +const todayAttendance=(data)=>{ + return request({ + url: `bgscreen/attendance/todayAttendance`, + data:data, + method: 'post' + }) +} export default{ getDeptWorksList, getWorkAttendanceList, - groupByComany + groupByComany, + todayAttendance } \ No newline at end of file diff --git a/src/pages/components/AttendanceDetailDialog.vue b/src/pages/components/AttendanceDetailDialog.vue new file mode 100644 index 0000000..b99d8fa --- /dev/null +++ b/src/pages/components/AttendanceDetailDialog.vue @@ -0,0 +1,131 @@ + + + + + + \ No newline at end of file diff --git a/src/pages/components/ProblemmodifyDetail.vue b/src/pages/components/ProblemmodifyDetail.vue index db33051..90cbcd0 100644 --- a/src/pages/components/ProblemmodifyDetail.vue +++ b/src/pages/components/ProblemmodifyDetail.vue @@ -42,17 +42,17 @@
整改超时({{ count['5'] }})
-
-
+
+
-
超时
-
{{ getCheckState(it.checkState) }}
+
+
{{ getCheckState(it.checkState) }}
总包单位:
{{ it.deptName }}
@@ -73,7 +73,7 @@ 抄送人:
{{ it.copySend }}
 - 隐患描述:
{{ it.workParts }} @@ -139,7 +139,7 @@ export default { elKey: 0, nav: 0, infoType: 0, - roleType:0, + roleType: 0, row: null, show: false, count: { @@ -152,7 +152,7 @@ export default { dataTable: [], dicts: [], checkStateDicts: [], - selDate:[] + selDate: [] }; }, @@ -183,15 +183,15 @@ export default { } else { postData.checkState = n } - if(this.selDate.length>0){ - postData.startDate=this.$dt(this.selDate[0]).format("YYYY-MM-DD"); + if (this.selDate.length > 0) { + postData.startDate = this.$dt(this.selDate[0]).format("YYYY-MM-DD"); } - if(this.selDate.length>1){ - postData.endDate=this.$dt(this.selDate[1]).format("YYYY-MM-DD"); + if (this.selDate.length > 1) { + postData.endDate = this.$dt(this.selDate[1]).format("YYYY-MM-DD"); } this.$api.problemmodify.listSspProblemmodify(postData).then(d => { - this.dataTable = (d.data || []).map(it => { - if(it.updateTime){ + this.dataTable = (d.data || []).map(it => { + if (it.updateTime) { let dt1 = +this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD")); let dt2 = +this.$dt(this.$dt(it.updateTime).format("YYYY-MM-DD")); if (dt1 < dt2) { @@ -199,7 +199,7 @@ export default { } else { it.timeout = false; } - }else if (it.nickedTime) { + } else if (it.nickedTime) { let dt1 = +this.$dt(this.$dt(it.nickedTime).format("YYYY-MM-DD")); let dt2 = +this.$dt(this.$dt(new Date()).format("YYYY-MM-DD")); if (dt1 < dt2) { @@ -209,17 +209,17 @@ export default { } } else { it.timeout = false; - } + } return it; }); this.elKey++; }) }, - showDialog(row, infoType,roleType,selDate) { - this.selDate=selDate; + showDialog(row, infoType, roleType, selDate) { + this.selDate = selDate; this.row = row; this.infoType = infoType; - this.roleType=roleType; + this.roleType = roleType; if (infoType == 0) { this.$api.dict('ssp_aqyhlx').then(d => { this.dicts = d || []; @@ -234,16 +234,16 @@ export default { }); this.show = true this.doNav(0, true); - let postData={ + let postData = { projectId: this.row.projectId, infoType: this.infoType, - roleType:this.roleType + roleType: this.roleType }; - if(this.selDate.length>0){ - postData.startDate=this.$dt(this.selDate[0]).format("YYYY-MM-DD"); + if (this.selDate.length > 0) { + postData.startDate = this.$dt(this.selDate[0]).format("YYYY-MM-DD"); } - if(this.selDate.length>1){ - postData.endDate=this.$dt(this.selDate[1]).format("YYYY-MM-DD"); + if (this.selDate.length > 1) { + postData.endDate = this.$dt(this.selDate[1]).format("YYYY-MM-DD"); } this.$api.problemmodify.groupByInfotypeCheckState(postData).then(d => { for (let i = 0; i <= 5; i++) { @@ -346,8 +346,9 @@ export default { &.time-out { box-shadow: inset 7px 0px 11px 5px rgb(167, 36, 36); + .text-state { - color: rgba(167, 36, 36,0.6) !important; + color: rgba(167, 36, 36, 0.6) !important; } } @@ -365,7 +366,8 @@ export default { transform: rotate(45deg); top: 60px; left: calc(50% - 100px); - &.state4{ + + &.state4 { color: rgba(5, 248, 5, 0.5); } } @@ -375,7 +377,7 @@ export default { margin-left: 10px; width: calc(100% - 414px); position: relative; - + .sp-lbl { display: inline-block; color: aquamarine; @@ -384,11 +386,23 @@ export default { .text-timeout { position: absolute; - right: 0px; - font-size: 64px; - color: red; - transform: rotate(45deg); - top: 27px; + right: -4px; + font-size: 24px; + color: #fff; + display: block; + padding: 20px; + background: linear-gradient(-135deg, red, red 50%, transparent 50%, transparent 100%); + height: 50px; + width: 50px; + + &::after { + content: "超时"; + transform: rotate(45deg); + display: block; + position: absolute; + left: 42px; + top: 15px; + } } .item-data { diff --git a/src/pages/index.vue b/src/pages/index.vue index 9f5a628..acb126a 100644 --- a/src/pages/index.vue +++ b/src/pages/index.vue @@ -48,8 +48,10 @@ - + +
在岗人数
今日出勤
@@ -222,6 +224,7 @@ +