From 5757b4d23c1f7ad734792481f9ceaa14deea7663 Mon Sep 17 00:00:00 2001 From: rdpnr_hemingxia Date: Mon, 28 Apr 2025 10:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/api.js | 6 + src/views/projectBank/userScoreDetail.vue | 334 ++++++++---------- src/views/workAppraisal/detail.vue | 69 +++- .../workAppraisal/taskModule/moduleDetail.vue | 4 +- .../workAppraisal/taskModule/taskModule.vue | 2 +- src/views/workAppraisal/taskSet.vue | 81 +++-- src/views/worklog/components/rightTable.vue | 296 ++++++---------- 7 files changed, 369 insertions(+), 423 deletions(-) diff --git a/src/utils/api.js b/src/utils/api.js index c3c92d6..316cabd 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -208,6 +208,12 @@ export const taskApi = { url: `/task/target/${id}`, method: 'get', }), + setTaskSet: (data) => request({ + url: `/task/config/update`, + method: 'put', + data: data, + + }), getTaskModel: (data) => request({ url: `/examine/template/list`, method: 'get', diff --git a/src/views/projectBank/userScoreDetail.vue b/src/views/projectBank/userScoreDetail.vue index b4d008d..b7f6092 100644 --- a/src/views/projectBank/userScoreDetail.vue +++ b/src/views/projectBank/userScoreDetail.vue @@ -10,34 +10,14 @@
- - + + - - + + @@ -46,11 +26,8 @@
- {{ (userList.find((ele) => ele.id == examineId) || {}).userName }} + {{ + (userList.find((ele) => ele.id == examineId) || {}).userName}}
考核评分:
@@ -60,92 +37,62 @@
-
+
{{ table[0].reviewCategory }}
- + - + + + + +
总体评价
- +
组长:{{ manageUserName }}
-
+
+
-
+
{{ table[0].reviewCategory }}
- + - + + - + +
+
评价
+
+ + +
+
+
+
+
+
总体评价
+
+ + +
+
-
- +
@@ -333,9 +241,12 @@ export default { tableData2: [], taskList: [], judgeContent: "", + selfJudgeContent: "", score: "", activeName: "first", manageUserName: "", + examineTask: {}, + examineRemark: {} }; }, methods: { @@ -389,16 +300,24 @@ export default { examineId: this.examineId, }; taskApi.getTaskScoreDetail(param).then((res) => { + this.examineRemark = res.data.remark + let objData = {}; res.data.examineConfigDetailVoList.forEach((ele) => { if (!objData[ele.reviewCategory]) objData[ele.reviewCategory] = []; objData[ele.reviewCategory].push(ele); }); if (type == 0) this.tableData1 = Object.values(objData); - else this.tableData2 = Object.values(objData); + else this.tableData2 = Object.values(objData).map((ele, index) => { + ele[0].remarkCate = this.examineRemark[index]?.remark + return ele + });; this.judgeContent = res.data.examineUser.judgeContent; + this.selfJudgeContent = res.data.examineUser.judgeContent; + this.manageUserName = res.data.examineUser.manageUserName; + this.examineTask = res.data.examineTask if (res.data.examineUser.score) { this.score = res.data.examineUser.score; } else if (res.data.examineUser.manageScore) { @@ -419,9 +338,11 @@ export default { .conetentBox { padding: 40px 30px 30px; background-color: #fff; - height: 90vh; /* 设置整体高度 */ + height: 90vh; + /* 设置整体高度 */ overflow: auto; } + .el-table { margin-top: 20px; } @@ -431,31 +352,37 @@ export default { font-size: 16px; font-weight: bold; } + ::v-deep .el-slider__runway { height: 14px; border-radius: 10px; margin: 10px !important; /* width: 95%; */ } + ::v-deep .el-slider__runway.disabled .el-slider__bar { height: 14px; border-radius: 10px; background-color: #ff5722; } + ::v-deep .el-slider__stop { height: 14px; border-radius: 0; z-index: 1000; } + ::v-deep .el-slider__bar { height: 14px; border-radius: 10px; background: linear-gradient(to right, #ffb144, #ff7d00); } + ::v-deep .el-slider__button { display: none; } + .scoreText { color: #fff; position: absolute; @@ -464,6 +391,7 @@ export default { display: flex; flex-direction: row; } + ::v-deep .el-table th { text-align: left; font-size: 14px; @@ -475,6 +403,7 @@ export default { font-size: 14px; font-weight: bold; } + .statusText { color: #ff7d00; position: absolute; @@ -483,43 +412,52 @@ export default { font-size: 14px; font-weight: 600; } + .hasEdit { color: #999999; } + ::v-deep .el-dialog { margin-top: 15% !important; } + .tableBox { height: 75%; overflow: auto; padding: 20px; background-color: #fff; } + .tableBox ::v-deep .el-table { border-left: 1px solid #eeeeee; border-right: 1px solid #eeeeee; } + .tableRow { padding: 20px; box-shadow: 0 0 20px #0000000f; } + .titleBox { font-size: 20px; font-weight: bold; margin-bottom: 40px; } + .headerBox { padding: 20px; background-color: #f9f9f9; border-radius: 2px; font-size: 16px; } + .block { width: 4px; height: 24px; background-color: #4096ff; margin-right: 10px; } + .stepBox { position: absolute; top: 33px; @@ -528,6 +466,7 @@ export default { background-color: #fff; z-index: 100; } + .totalBox { width: 180px; display: flex; @@ -535,28 +474,35 @@ export default { font-size: 16px; color: #333333; } + .scoreTotal { font-size: 28px; font-weight: 700; color: #ff7d00; } + ::v-deep .sorceTableCell .cell { margin-bottom: 20px; } + ::v-deep .el-table__body .el-table__cell { padding: 20px 40px; } + ::v-deep .el-table__header .el-table__cell { padding: 14px 30px; } + ::v-deep .el-tabs__item.is-active { color: #4096ff; } + ::v-deep .el-tabs__item { font-size: 18px; font-weight: bold; color: #999999; } + ::v-deep .el-tabs__active-bar { height: 3px; width: 32px !important; diff --git a/src/views/workAppraisal/detail.vue b/src/views/workAppraisal/detail.vue index a2321c5..a421f1b 100644 --- a/src/views/workAppraisal/detail.vue +++ b/src/views/workAppraisal/detail.vue @@ -29,7 +29,7 @@ + min-width="320">