From c8c287de1c08e7fea132ddfa380be122e2ae40e0 Mon Sep 17 00:00:00 2001 From: haha Date: Sat, 19 Aug 2023 13:08:03 +0800 Subject: [PATCH] update code --- src/pages/components/ProblemmodifyDetail.vue | 116 +++++++++++++------ 1 file changed, 83 insertions(+), 33 deletions(-) diff --git a/src/pages/components/ProblemmodifyDetail.vue b/src/pages/components/ProblemmodifyDetail.vue index 822b930..f90557d 100644 --- a/src/pages/components/ProblemmodifyDetail.vue +++ b/src/pages/components/ProblemmodifyDetail.vue @@ -40,17 +40,19 @@
复检驳回({{ count['3'] }})
复检通过({{ count['4'] }})
整改超时({{ count['5'] }})
- +
-
+
+ :src="it.marksPicture + '.min.jpg'">
-
超时
+
超时
+
{{ getCheckState(it.checkState) }}
隐患类型:
{{ getDangerType(it.dangerType) }}
@@ -67,22 +69,38 @@ 抄送人:
{{ it.copySend }}
 - - 流程状态: -
{{ getCheckState(it.checkState) }}
+ + 隐患描述:
{{ it.workParts }} @@ -145,27 +163,35 @@ export default { return; } this.nav = n; - let postData={ + let postData = { projectId: this.row.projectId, - infoType: this.infoType, + infoType: this.infoType, }; - if(n==5){ - postData.activeName='zgcs' - }else{ - postData.checkState=n + if (n == 5) { + postData.activeName = 'zgcs' + } else { + postData.checkState = n } this.$api.problemmodify.listSspProblemmodify(postData).then(d => { - this.dataTable = (d.data || []).map(it=>{ - 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 { + 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) { + it.timeout = true; + } else { + it.timeout = false; } - }else{ - it.timeout=false; + }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) { + it.timeout = true; + } else { + it.timeout = false; + } + } else { + it.timeout = false; } return it; }); @@ -191,13 +217,16 @@ export default { this.doNav(0, true); this.$api.problemmodify.groupByInfotypeCheckState({ projectId: this.row.projectId, - infoType:this.infoType + infoType: this.infoType }).then(d => { + for (let i = 0; i <= 5; i++) { + this.count["" + i] = 0; + } let tmps = (d.data || []).filter(it => it.infoType == this.infoType); tmps.forEach(it => { this.count["" + it.checkState] = it.id; }) - console.log("--->",this.count) + console.log("--->", this.count) }) } }, @@ -226,14 +255,15 @@ export default { } &.font-size-2 { - .head-title-tab{ - .head-nav{ + .head-title-tab { + .head-nav { font-size: 32px; height: 48px; line-height: 48px; padding: 0px 48px; } } + .item-data { line-height: 64px; font-size: 32px; @@ -247,18 +277,20 @@ export default { } &.font-size-1 { - .head-title-tab{ - .head-nav{ + .head-title-tab { + .head-nav { font-size: 24px; height: 30px; line-height: 30px; padding: 0px 30px; } } + .item-data { line-height: 48px; font-size: 24px; line-height: 48px; + .div-text { line-height: 48px; } @@ -284,15 +316,32 @@ export default { box-shadow: inset 7px 0px 11px 5px rgb(36 131 167 / 70%); display: flex; padding-left: 8px; - &.time-out{ + + &.time-out { box-shadow: inset 7px 0px 11px 5px rgb(167, 36, 36); + .text-state { + color: rgba(167, 36, 36,0.6) !important; + } } + .item-left { display: inline-flex; width: 200px; align-items: center; } + .text-state { + font-size: 32px; + position: absolute; + color: rgba(200, 200, 200, 0.2); + transform: rotate(45deg); + top: 60px; + left: calc(50% - 100px); + &.state4{ + color: rgba(5, 248, 5, 0.5); + } + } + .item-right { display: inline-block; margin-left: 10px; @@ -304,7 +353,8 @@ export default { color: aquamarine; } - .text-timeout{ + + .text-timeout { position: absolute; right: 0px; font-size: 64px;