Merge branch 'zcwy-zsx0223' into 'master'

Zcwy zsx0223

See merge request !177

src/views/projectcenter/TaskPage.vue

@@ -2646,11 +2646,15 @@ export default {
           ellipsis: true,
           customRender: ({ record }) => (
             <div>
-              {record.stuStatus == 2
-                ? "进行中"
-                : record.status == 1
-                ? "已完成"
-                : "未开始"}
+              {record.totalTaskNum == 0 ? (
+                <div>未开始</div>
+              ) : record.finishTaskNum == 0 ? (
+                <div>未开始</div>
+              ) : record.finishTaskNum == record.totalTaskNum ? (
+                <div>已完成</div>
+              ) : (
+                <div>进行中</div>
+              )}
             </div>
           ),
         },

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,