From 4f7b70aea33cdd465dcd41cda20fc34d48020ede Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 11 May 2022 17:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=B8=85?=
 =?UTF-8?q?=E7=9A=84=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectManagement/components/TaskList.vue | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index a61584e34..1ac1af27b 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -19,7 +19,7 @@
             <j-dict-select-tag class="box-input" v-model="queryParam.dutyTerritory"
                                :placeholder="$t('PleaseSelect')+$t('areaOfResponsibility')"
                                :type="'select'"
-                               :triggerChange="false" :dictCode="'region'"/>
+                               :triggerChange="false" :dictCode="'duty_territory'"/>
           </div>
         </a-col>
         <span style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
@@ -57,9 +57,10 @@
           </div>
         </div>
         <div slot="areaOfResponsibility" slot-scope="text,result" class="box-left">
-          <div class="content">
-            <span class="box-content-index">1212sdfdsf</span><br/>
-            <span class="box-content-index">hahahaha</span>
+          <div class="content" v-if="result.dutyTerritory">
+            <span v-for="(item,index) in result.dutyTerritory.split(',')">
+            <span class="box-content-index">{{item}}</span><br/>
+            </span>
           </div>
         </div>
         <div slot="confirmationOfDesignConformity" slot-scope="text,result" class="box-left">
@@ -99,7 +100,7 @@
           </div>
         </div>
         <div slot="CertificationProgress" slot-scope="text,result">
-             <span class="box-content-color box-content-cou" @click="CertificationProgressClick(result)">
+             <span class="box-content-Progress box-content-cou" @click="CertificationProgressClick(result)">
                   实验通过
              </span>
         </div>
@@ -454,52 +455,62 @@
   }
 
   .accordColor {
-    background: #96ecad;
+    background: #dbf6e2;
     color: #26BD4B;
   }
 
   .nonConformityColor {
-    background: #eeaeae;
+    background: #f3dddd;
     color: #E83030;
   }
 
   .TrackedColor {
-    background: #f0d7b1;
+    background: #f6ebdb;
     color: #FDA71C;
   }
 
   .notInvolvedColor {
-    background: #e2edf8;
+    background: #eef1f4;
     color: #707486;
   }
 
   .submittedColor {
     color: #00B3BE;
-    background: #94e0e4;
+    background: #ddf3f4;
   }
 
   .Current-color {
     display: inline-block;
-    width: 26px;
-    height: 26px;
+    width: 28px;
+    height: 28px;
     line-height: 32px;
     text-align: center;
-    background: #fff;
+    background: #dcf7e3;
     border-radius: 50%;
-    border: 1px red solid;
   }
 
   .Current-color-box {
     display: inline-block;
-    width: 18px;
-    height: 18px;
-    background: red;
+    width: 14px;
+    height: 14px;
+    background: #26BD4B;
     border-radius: 50%;
   }
 
   .box-content-cou {
     cursor: pointer;
   }
+
+  .box-content-Progress {
+    width: 88px;
+    height: 32px;
+    display: inline-block;
+    text-align: center;
+    line-height: 32px;
+    border-radius: 4px;
+    background: #dbf6e2;
+    color: #26BD4B;
+  }
 </style>
 <style>
   .box-input .ant-select-selection {