From 787ad02b4256c8786cbc89441b1fe5a55c66ee96 Mon Sep 17 00:00:00 2001
From: X_Rian <904416525@qq.com>
Date: Wed, 31 Jul 2024 11:34:00 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E5=AE=89=E5=85=A8/=E8=B4=A8?=
 =?UTF-8?q?=E9=87=8F=E8=87=AA=E6=A3=80=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=92=8C=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quality/v2/projectSelfInspection.vue      | 67 ++++++++++++++++++-
 .../safeSame/v2/projectSelfInspection.vue     | 31 +++++++--
 2 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/src/views/projectFront/quality/v2/projectSelfInspection.vue b/src/views/projectFront/quality/v2/projectSelfInspection.vue
index 80719267..a213f658 100644
--- a/src/views/projectFront/quality/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/quality/v2/projectSelfInspection.vue
@@ -115,6 +115,23 @@
             {{ scope.row.startTime }} 至 {{ scope.row.endTime }}
           </template>
         </el-table-column>
+        <el-table-column
+          prop="inspectNum"
+          label="任务状态"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div class="stateItem">
+              <div>
+                {{ scope.row.taskCompleteNum ? scope.row.taskCompleteNum : 0 }}/{{ scope.row.taskNum ? scope.row.taskNum : 0 }}
+              </div>
+              <!-- bg-cbad14(进行中)  bg-57b54b(已完成) bg-6389f6(未开始) bg-ffc8c8(已逾期) -->
+              <div v-if="scope.row.taskStatus" :class="taskStatusList[scope.row.taskStatus - 1].color">
+                {{ taskStatusList[scope.row.taskStatus - 1].title }}
+              </div>
+            </div>
+          </template>
+        </el-table-column>
         <!-- 隐患总数 -->
         <el-table-column
           prop="inspectNum"
@@ -483,7 +500,24 @@ export default {
       checkDaterange: [],
       frequencyType: this.$t('message.safeMangeCheck.frequency'),
       accountList: [],
-      enterpriseListData: []
+      enterpriseListData: [],
+      taskStatusList:[{
+        id: 1,
+        title: "未开始",
+        color: "bg-6389f6",
+      },{
+        id: 2,
+        title: "进行中",
+        color: "bg-cbad14",
+      }, {
+        id: 3,
+        title: "已完成",
+        color: "bg-57b54b",
+      }, {
+        id: 4,
+        title: "已逾期",
+        color: "bg-ffc8c8",
+      }]
     }
   },
 
@@ -647,6 +681,37 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+.stateItem{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  >div:last-child {
+    margin-left: 10px;
+    padding: 2px 5px;
+    border-radius: 5px;
+  }
+
+  .bg-ffc8c8 {
+    background-color: #FFC8C8;
+    color:#FF5A5F;
+    border: 1px solid #FF5A5F;
+  }
+  .bg-6389f6 {
+    background-color: #D9E3FD;
+    color:#6389F6;
+    border: 1px solid #6389F6;
+  }
+  .bg-57b54b {
+    background-color: #C2E8BD;
+    color:#57B54B;
+    border: 1px solid #57B54B;
+  }
+  .bg-cbad14 {
+    background-color: #F4E9AB;
+    color:#CBAD14;
+    border: 1px solid #CBAD14;
+  }
+}
 .filterBox {
   margin: 15px;
 }
diff --git a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
index 76788324..aca6b6d7 100644
--- a/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
+++ b/src/views/projectFront/safeSame/v2/projectSelfInspection.vue
@@ -116,7 +116,7 @@
             {{ scope.row.startTime }} 至 {{ scope.row.endTime }}
           </template>
         </el-table-column>
-        <!-- <el-table-column
+        <el-table-column
           prop="inspectNum"
           label="任务状态"
           align="center"
@@ -124,15 +124,15 @@
           <template slot-scope="scope">
             <div class="stateItem">
               <div>
-                3/10
+                {{ scope.row.taskCompleteNum }}/{{ scope.row.taskNum }}
               </div>
-              bg-cbad14(进行中)  bg-57b54b(已完成) bg-6389f6(未开始) bg-ffc8c8(已逾期)
-              <div class="bg-ffc8c8">
-                已逾期
+              <!-- bg-cbad14(进行中)  bg-57b54b(已完成) bg-6389f6(未开始) bg-ffc8c8(已逾期) -->
+              <div v-if="scope.row.taskStatus" :class="taskStatusList[scope.row.taskStatus - 1].color">
+                {{ taskStatusList[scope.row.taskStatus - 1].title }}
               </div>
             </div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <!-- 隐患总数 -->
         <el-table-column
           prop="inspectNum"
@@ -500,7 +500,24 @@ export default {
       checkDaterange: [],
       frequencyType: this.$t('message.safeMangeCheck.frequency'),
       accountList: [],
-      enterpriseListData: []
+      enterpriseListData: [],
+      taskStatusList:[{
+        id: 1,
+        title: "未开始",
+        color: "bg-6389f6",
+      },{
+        id: 2,
+        title: "进行中",
+        color: "bg-cbad14",
+      }, {
+        id: 3,
+        title: "已完成",
+        color: "bg-57b54b",
+      }, {
+        id: 4,
+        title: "已逾期",
+        color: "bg-ffc8c8",
+      }]
     }
   },