diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 69e548480..f8f7be466 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1825,4 +1825,5 @@ module.exports = { parameterCollectionProgress:'Parameter Collection Progress', proportion:'Proportion', projectProgressStatistics:'Project Progress Statistics', + GRPSystemProjectProgressStatistics:'GRP system project progress statistics', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 4ea7862f0..ae56fa752 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1927,4 +1927,5 @@ module.exports = { parameterCollectionProgress:'参数收集进度', proportion:'占比', projectProgressStatistics:'项目进度统计', + GRPSystemProjectProgressStatistics:'GRP系统项目进度统计', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index a8cda90c8..784233db2 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -165,6 +165,150 @@ + +
+
+ + G0 +
+ + + +
+ + +
+
+ + G1 +
+ + + +
+ + +
+
+ + G2 +
+ + + +
+ + +
+
+ + G3 +
+ + + +
+ + +
+
+ + G4 +
+ + + +
+ + +
+
+ + G5 +
+ + + +
+ + +
+
+ + G6 +
+ + + +
+ + +
+
+ + G7 +
+ + + +
+ diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 9ec232d63..40de5d47a 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -71,8 +71,9 @@
- - + + + {{ $t('export') }}
@@ -483,7 +484,7 @@ for (let i = 0; i < timeData.length; i++) { for (let j = 0; j < timeData[i].data[0].length; j++) { for (let k = 0; k < dataList.length; k++) { - let num = (Math.floor(clientWidth / 30 * 10000)/10000) * parseInt(timeData[i].data[0][j].time.slice(8, 10)) + let num = (Math.floor(clientWidth / 30 * 10000) / 10000) * parseInt(timeData[i].data[0][j].time.slice(8, 10)) timeList.forEach((res, index) => { if (timeData[i].data[0][j].time.slice(0, 7) == res.slice(0, 7)) { timeData[i].data[0][j].left = 'left:' + ((clientWidth * index + num) - 10) + 'px' @@ -496,15 +497,15 @@ contentRightXian[0].style = 'display:none' let clientWidthOne = dataList[0].clientWidth clientWidthOne = clientWidthOne / length - let num = (Math.floor(clientWidthOne / 30 * 10000)/10000) * parseInt(this.handlingTime.slice(8, 10)) + let num = (Math.floor(clientWidthOne / 30 * 10000) / 10000) * parseInt(this.handlingTime.slice(8, 10)) timeList.forEach((res, index) => { if (res.slice(0, 7) == this.handlingTime.slice(0, 7)) { if (timeList.length - 1 == index) { - contentRightText[0].style = 'left:' + ((clientWidthOne * index + num)-84) + 'px;' + 'display:block;border-radius: 2px 0 2px 2px;' - }else{ - contentRightText[0].style = 'left:' + ((clientWidthOne * index + num)+2) + 'px;' + 'display:block;border-radius: 2px 2px 2px 0;' + contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) - 84) + 'px;' + 'display:block;border-radius: 2px 0 2px 2px;' + } else { + contentRightText[0].style = 'left:' + ((clientWidthOne * index + num) + 2) + 'px;' + 'display:block;border-radius: 2px 2px 2px 0;' } - contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num)+2) + 'px;' + 'display:block' + contentRightXian[0].style = 'left:' + ((clientWidthOne * index + num) + 2) + 'px;' + 'display:block' } }) @@ -558,6 +559,15 @@ query: item }) window.open(newUrl.href, '_blank') + }, + //导出 + handleExport() { + let query = { + ...this.queryParam, + startTime: this.startTime || this.getNewDate('before', 6), + endTime: this.endTime || this.getNewDate('after', 5) + } + downloadFile(this.url.exportData, this.$t('GRPSystemProjectProgressStatistics') + '.xls', query, this.Deselect) } } } @@ -657,9 +667,11 @@ .box-top-text-right { display: inline-block; float: right; - height: 10px; - width: 300px; + height: 30px; + text-align: right; + margin-right: 16px; margin-top: -4px; + cursor: pointer; } .fullScreenView { @@ -874,7 +886,8 @@ position: absolute; top: 48px; } - .process-content-right-xian-color{ + + .process-content-right-xian-color { height: 28px; width: 100%; position: absolute; @@ -882,6 +895,7 @@ background: linear-gradient(90deg, rgba(0, 179, 190, 0.12) 0%, rgba(4, 11, 41, 0.02) 100%); transform: matrix(-1, 0, 0, 1, 0, 0); } + .process-content-right-xian-one { height: 1px; width: 100%;