From fe50e77c2ea4a2d401228e9587e5d958327187c5 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 12 May 2022 17:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E8=AE=A4=E8=AF=81=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/projectManagement/components/TaskList.vue    |  4 ++--
 .../projectManagement/components/TaskListModel.vue     | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index e0e1afe6b..54c1bac09 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -115,9 +115,9 @@
              </span>
         </div>
         <div slot="CurrentProjectStatusEvaluation" slot-scope="text,result">
-          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.conditionAssessment]}"
+          <div class="Current-color box-content-cou" :style="{'background':CurrentColor[result.projectStatusAssess]}"
                @click="CurrentProjectClick(result)">
-            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.conditionAssessment]}"></div>
+            <div class="Current-color-box" :style="{'background':CurrentColorBox[result.projectStatusAssess]}"></div>
           </div>
         </div>
       </a-table>
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index 9f4cc4c69..af132d7f4 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -58,17 +58,17 @@
                 :disabled="disabled"
                 v-model="formInline.conditionAssessment"
                 :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
-                <a-select-option :key="1" :value="1">
+                <a-select-option :value="'1'">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('red') }}
                      </span>
                 </a-select-option>
-                <a-select-option :key="2" :value="2">
+                <a-select-option :value="'2'">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('yellow') }}
                      </span>
                 </a-select-option>
-                <a-select-option :key="3" :value="3">
+                <a-select-option :value="'3'">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('green') }}
                      </span>
@@ -128,6 +128,10 @@
       getData(val, title) {
         this.visible = true
         this.title = title
+        if (title == this.$t('CurrentProjectStatusEvaluation')) {
+          val.remark = val.projectStatusAssessRemark || ''
+          val.conditionAssessment = val.projectStatusAssess || ''
+        }
         this.formInline = val
         if (val.roleCode == '2' || val.roleCode == '4') {
           this.disabled = false