From 19c7ae954a480822a511b9edd91576dee893a2e8 Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 20 May 2024 13:19:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AD=A6=E9=99=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index deca32bb..af7546c1 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2646,7 +2646,7 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.stuStatus == 2
+              {record.status == 2
                 ? "进行中"
                 : record.status == 1
                 ? "已完成"

From 419babc034af5dbf5afd2d8c085df2da708da6fc Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 20 May 2024 13:39:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=BB=A1=E6=84=8F=E5=BA=A6=E8=B0=83?=
 =?UTF-8?q?=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/ResearchAdd.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue
index 681d0857..402835f1 100644
--- a/src/views/research/ResearchAdd.vue
+++ b/src/views/research/ResearchAdd.vue
@@ -91,8 +91,8 @@ const handleSave = () => {
     return false;
   }
    const listsss = data.value.scoringQuestionVoList.map((item) => ({
-        minimumEvaluation: item.minimumEvaluation || '非常满意',
-        highestEvaluation: item.highestEvaluation || '非常不满意',
+        minimumEvaluation: item.minimumEvaluation || '非常不满意',
+        highestEvaluation: item.highestEvaluation || '非常满意',
         orderNumber: item.orderNumber,
         assessmentId: id,
       }));
@@ -192,8 +192,8 @@ function addScoringQuestionItem() {
     questionType: 4,
     assessmentScTitle: "",
     assessmentMaxScore: 10,
-    minimumEvaluation: '非常满意',
-    highestEvaluation: '非常不满意',
+    minimumEvaluation: '非常不满意',
+    highestEvaluation: '非常满意',
     assessmentMinScore: 1,
     weightScale: 100,
     orderNumber: orderList.value?.length + 1,

From b8a2aacfcffe1244e9c6c0a2224a3ec01158c6ab Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Mon, 20 May 2024 14:48:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskPage.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue
index af7546c1..6a33af3f 100644
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -2646,11 +2646,15 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.status == 2
-                ? "进行中"
-                : record.status == 1
-                ? "已完成"
-                : "未开始"}
+              {record.totalTaskNum == 0 ? (
+                <div>未开始</div>
+              ) : record.finishTaskNum == 0 ? (
+                <div>未开始</div>
+              ) : record.finishTaskNum == record.totalTaskNum ? (
+                <div>已完成</div>
+              ) : (
+                <div>进行中</div>
+              )}
             </div>
           ),
         },