From 03fbda5658dab36c6945ae8d78aee3285a10c489 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 12 May 2022 16:44:18 +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

---
 jero-web/src/common/lang/en-us.js             |  6 ++-
 jero-web/src/common/lang/zh-cn.js             |  6 ++-
 .../projectManagement/components/TaskList.vue |  4 +-
 .../components/TaskListModel.vue              | 46 +++++++++++--------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 558ec8b23..0fd393253 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -812,5 +812,9 @@ module.exports = {
   inconformity:'Non-Compliance',
   toTrack:'To be tracked',
   Launch:'Launch',
-  maintainProgress:'Maintain'
+  maintainProgress:'Maintain',
+  redSchedule:'Red: not in conformity, and there is no acceptable scheme and schedule',
+  yellowSchedule:'Yellow: non conformance / to be tracked, with acceptable scheme and schedule',
+  greenRequirements:'Green: confirm that it meets or meets the current requirements',
+  blueUndeterminedState:'Blue: undetermined state',
 }
\ 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 8bf85de11..7ced33184 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -817,5 +817,9 @@ module.exports = {
   inconformity:'不符合',
   toTrack:'待追踪',
   Launch:'发起',
-  maintainProgress:'维护进度'
+  maintainProgress:'维护进度',
+  redSchedule:'红：不符合，且无可接受的方案和时间表',
+  yellowSchedule:'黄：不符合/待追踪，有可接受的方案和时间表',
+  greenRequirements:'绿：确认符合或满足当前要求',
+  blueUndeterminedState:'蓝：未判断状态',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 95c9ac589..9d4d0fcd6 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -523,7 +523,7 @@
     height: 28px;
     line-height: 32px;
     text-align: center;
-    background: #dcf7e3;
+    background: #ddf3f4;
     border-radius: 50%;
   }
 
@@ -531,7 +531,7 @@
     display: inline-block;
     width: 14px;
     height: 14px;
-    background: #26BD4B;
+    background: #00B3BE;
     border-radius: 50%;
   }
 
diff --git a/jero-web/src/views/projectManagement/components/TaskListModel.vue b/jero-web/src/views/projectManagement/components/TaskListModel.vue
index b7bec0ac5..d32baf06e 100644
--- a/jero-web/src/views/projectManagement/components/TaskListModel.vue
+++ b/jero-web/src/views/projectManagement/components/TaskListModel.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="title"
-    :width="600"
+    :width="700"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
@@ -10,10 +10,15 @@
   >
     <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
       <a-row :gutter="24">
+        <div class="headerText" v-if="title == $t('CurrentProjectStatusEvaluation')">
+          {{this.$t('redSchedule')}}<br/>
+          {{this.$t('yellowSchedule')}}<br/>
+          {{this.$t('greenRequirements')}}<br/>
+          {{this.$t('blueUndeterminedState')}}
+        </div>
         <a-col :span="24" v-if="title == $t('CertificationProgress')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('CertificationProgress')">{{$t('CertificationProgress')}}</span>
             </div>
@@ -30,7 +35,6 @@
         <a-col :span="24" v-if="title == $t('CertificationProgress')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required" v-if="!disabled">*</span>
               <span class="title-text-text"
                     :title="$t('remarks')">{{$t('remarks')}}</span>
             </div>
@@ -46,32 +50,33 @@
         <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required">*</span>
               <span class="title-text-text"
                     :title="$t('CurrentProjectStatusEvaluation')">{{$t('CurrentProjectStatusEvaluation')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="remarks">
-              <a-select :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
+              <a-select
+                :disabled="disabled"
+                :placeholder="$t('PleaseSelect')+$t('CurrentProjectStatusEvaluation')">
                 <a-select-option :key="1" :value="1">
-                     <span style="display: inline-block;width: 100%">
-                            {{ $t('green') }}
-                     </span>
-                </a-select-option>
-                <a-select-option :key="2" :value="2">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('red') }}
                      </span>
                 </a-select-option>
-                <a-select-option :key="3" :value="3">
-                     <span style="display: inline-block;width: 100%">
-                            {{ $t('blue') }}
-                     </span>
-                </a-select-option>
-                <a-select-option :key="4" :value="4">
+                <a-select-option :key="2" :value="2">
                      <span style="display: inline-block;width: 100%">
                             {{ $t('yellow') }}
                      </span>
                 </a-select-option>
+                <a-select-option :key="3" :value="3">
+                     <span style="display: inline-block;width: 100%">
+                            {{ $t('green') }}
+                     </span>
+                </a-select-option>
+                <!--                <a-select-option :key="3" :value="3">-->
+                <!--                     <span style="display: inline-block;width: 100%">-->
+                <!--                            {{ $t('blue') }}-->
+                <!--                     </span>-->
+                <!--                </a-select-option>-->
               </a-select>
             </a-form-model-item>
           </div>
@@ -80,14 +85,13 @@
         <a-col :span="24" v-if="title == $t('CurrentProjectStatusEvaluation')">
           <div class="box-title-text">
             <div class="title-text">
-              <span class="Required">*</span>
               <span class="title-text-text"
                     :title="$t('remarks')">{{$t('remarks')}}</span>
             </div>
             <a-form-model-item class="itemModel" prop="remarks">
               <a-textarea
                 :placeholder="$t('remarks')"
-                :disabled="false"
+                :disabled="disabled"
                 v-model="formInline.remark" :rows="4"/>
             </a-form-model-item>
           </div>
@@ -209,4 +213,10 @@
   .title-text-text {
     margin-top: 9px;
   }
+
+  .headerText {
+    margin-left: 30px;
+    color: #040B29;
+    font-weight: 400;
+  }
 </style>
\ No newline at end of file