diff --git a/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue b/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue index 976b3dde..a756e848 100644 --- a/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue +++ b/yanzhu-bigscreen/src/views/check/projectCheckedDetailDialog.vue @@ -33,7 +33,7 @@
工序部位:
-
{{ row.workingPosition }}
+
{{ row.workingPositionFull }}
验收描述:
diff --git a/yanzhu-bigscreen/src/views/projectChecked.vue b/yanzhu-bigscreen/src/views/projectChecked.vue index d220ef9e..274507a8 100644 --- a/yanzhu-bigscreen/src/views/projectChecked.vue +++ b/yanzhu-bigscreen/src/views/projectChecked.vue @@ -2,17 +2,9 @@
- + @@ -172,13 +138,8 @@
@@ -294,7 +255,7 @@ export default { }, getCheckedCount(n) { let obj = this.groupData.find( - (item) => item.name == (n == 1 ? "已验收" : "未验收") + (item) => item.name == (n == 1 ? "已验收" : "待验收") ); return obj ? obj.value : 0; }, @@ -329,7 +290,7 @@ export default { pageSize: this.size, }; this.$api.checked.listProjectChecked(param).then((res) => { - this.total = res.total + 20; + this.total = res.total; this.listData = this.mapData(res); this.listKey++; }); @@ -351,9 +312,6 @@ export default { if (item.imageUrls) { item.images = item.imageUrls.split(","); item.image = item.images[0]; - for (let i = 0; i < 6; i++) { - item.images.push(item.images[0]); - } } else { item.image = ""; item.images = []; @@ -374,7 +332,10 @@ export default { item.checkResultName = "验收不通过"; item.checkResultColor = 2; } + let task = this.$tryToJson(item.workingPosition, {}) + item.workingPositionName = task.name; + item.workingPositionFull = task.full; return item; }); }, @@ -538,6 +499,7 @@ export default { } .chart1-group { + .chart-gif, .chart-text { left: 51px !important; @@ -641,6 +603,17 @@ export default { color: #32e1e4; } + .item-data { + max-width: calc(100% - 80px); + + .el-tooltip { + white-space: nowrap; + display: block; + overflow: hidden; + text-overflow: ellipsis; + } + } + .check-state { display: inline-block; line-height: 20px; @@ -669,9 +642,11 @@ export default { @media (min-width: 1921px) and (max-width: 2560px) { .no-data { - font-size: 16px; - } + font-size: 16px; + } + .chart1-group { + .chart-gif, .chart-text { left: 59px !important; @@ -719,7 +694,7 @@ export default { padding-left: 10px; .item-right-row { - line-height: 30px; + line-height: 34px; .check-state { line-height: 30px; @@ -732,10 +707,12 @@ export default { } @media (min-width: 2561px) { - .no-data { - font-size: 24px; - } + .no-data { + font-size: 24px; + } + .chart1-group { + .chart-gif, .chart-text { left: 79px !important;