From 7211563978ad0bdc0ed42b5454f3a48494991adc Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Thu, 19 Dec 2024 14:39:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E5=BD=92=E6=A1=A3?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=80=9A=E8=BF=87/=E6=9C=AA=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/config/testPlan.ts               |  2 +-
 frontend/src/config/workbench.ts              |  6 +++
 frontend/src/enums/workbenchEnum.ts           |  2 +
 .../components/recycle/case/caseTable.vue     |  1 -
 .../homePage/components/passRatePie.vue       | 19 +++++---
 .../homePage/components/testPlanCount.vue     | 47 ++++++++++++++++++-
 6 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/frontend/src/config/testPlan.ts b/frontend/src/config/testPlan.ts
index 1b1402907c..a982b36c75 100644
--- a/frontend/src/config/testPlan.ts
+++ b/frontend/src/config/testPlan.ts
@@ -157,7 +157,7 @@ export const toolTipConfig: TooltipOption = {
   appendTo: 'body',
   formatter(params: any) {
     const html = `
-      <div class="w-[144px] p-[16px] rounded flex items-center justify-between bg-[var(--color-bg-5)]">
+      <div class="p-[16px] w-[180px] rounded flex items-center justify-between bg-[var(--color-bg-5)]">
           <div class=" flex items-center">
             <div class="mb-[2px] mr-[8px] h-[6px] w-[6px] rounded-full bg-[${params.color}]" style="background:${
       params.color
diff --git a/frontend/src/config/workbench.ts b/frontend/src/config/workbench.ts
index eadd0dc6ea..cfc61fa997 100644
--- a/frontend/src/config/workbench.ts
+++ b/frontend/src/config/workbench.ts
@@ -407,6 +407,12 @@ export const NAV_NAVIGATION: Record<WorkNavValueEnum, any> = {
   [WorkNavValueEnum.TEST_PLAN_NOT_PASS]: {
     passed: ['NOT_PASSED'], // 测试计划-未通过
   },
+  [WorkNavValueEnum.TEST_PLAN_PASSED_ARCHIVED]: {
+    archivedPassed: [true], // 测试计划-已归档-已通过
+  },
+  [WorkNavValueEnum.TEST_PLAN_NOT_PASS_ARCHIVED]: {
+    archivedPassed: [false], // 测试计划-已归档-未通过
+  },
   /**
    * 测试计划遗留缺陷
    */
diff --git a/frontend/src/enums/workbenchEnum.ts b/frontend/src/enums/workbenchEnum.ts
index ff56ba9c1e..818643e1cc 100644
--- a/frontend/src/enums/workbenchEnum.ts
+++ b/frontend/src/enums/workbenchEnum.ts
@@ -101,6 +101,8 @@ export enum WorkNavValueEnum {
   TEST_PLAN_ARCHIVED = 'TEST_PLAN_ARCHIVED', // 测试计划-已归档
   TEST_PLAN_PASSED = 'TEST_PLAN_PASSED', // 测试计划已通过
   TEST_PLAN_NOT_PASS = 'TEST_PLAN_NOT_PASS', // 测试计划未通过通过
+  TEST_PLAN_NOT_PASS_ARCHIVED = 'TEST_PLAN_NOT_PASS_ARCHIVED', // 测试计划未通过已归档
+  TEST_PLAN_PASSED_ARCHIVED = 'TEST_PLAN_PASSED_ARCHIVED', // 测试计划已通过已归档
 
   TEST_PLAN_BUG = 'TEST_PLAN_BUG', // 测试计划总缺陷
   TEST_PLAN_LEGACY = 'TEST_PLAN_LEGACY', // 测试计划遗留缺陷
diff --git a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
index 59ae4bec4b..9bb5b4c62e 100644
--- a/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
+++ b/frontend/src/views/api-test/management/components/recycle/case/caseTable.vue
@@ -162,7 +162,6 @@
         sortDirections: ['ascend', 'descend'],
         sorter: true,
       },
-      fixed: 'left',
       width: 110,
       columnSelectorDisabled: true,
     },
diff --git a/frontend/src/views/workbench/homePage/components/passRatePie.vue b/frontend/src/views/workbench/homePage/components/passRatePie.vue
index 74372b6880..d41d9b9cdc 100644
--- a/frontend/src/views/workbench/homePage/components/passRatePie.vue
+++ b/frontend/src/views/workbench/homePage/components/passRatePie.vue
@@ -12,11 +12,15 @@
       <MsChart height="92px" width="92px" :options="props.options" />
     </div>
     <div class="pass-rate-title flex-1">
-      <div v-for="item of props.valueList" :key="item.label" class="flex-1">
-        <div class="one-line-text mb-[8px] text-[var(--color-text-4)]">{{ item.label }}</div>
-        <div class="pass-rate-count" @click="goNavigation(item)">
-          {{ hasPermission ? addCommasToNumber(item.value as number) : '-' }}
-        </div>
+      <div v-for="(item, index) of props.valueList" :key="item.label" class="flex-1">
+        <slot :ele="item" :index="index">
+          <div class="one-line-text mb-[8px] text-[var(--color-text-4)]">{{ item.label }}</div>
+          <div class="pass-rate-count text-[rgb(var(--primary-4))]">
+            <div @click="goNavigation(item)">
+              {{ hasPermission ? addCommasToNumber(item.value as number) : '-' }}
+            </div>
+          </div>
+        </slot>
       </div>
     </div>
   </a-spin>
@@ -44,6 +48,7 @@
       value: number | string;
       status?: string;
       route?: string;
+      archivedPassed?: number;
     }[];
   }>();
 
@@ -67,8 +72,8 @@
       @apply flex items-center gap-2;
       .pass-rate-count {
         font-size: 20px;
-        color: rgb(var(--primary-4));
-        @apply cursor-pointer font-medium;
+        gap: 8px;
+        @apply flex cursor-pointer  items-center justify-start font-medium;
       }
     }
   }
diff --git a/frontend/src/views/workbench/homePage/components/testPlanCount.vue b/frontend/src/views/workbench/homePage/components/testPlanCount.vue
index aa3ed88593..1b027e83bc 100644
--- a/frontend/src/views/workbench/homePage/components/testPlanCount.vue
+++ b/frontend/src/views/workbench/homePage/components/testPlanCount.vue
@@ -29,7 +29,22 @@
               :has-permission="hasPermission"
               :options="tabItem.options"
               :value-list="tabItem.valueList"
-            />
+            >
+              <template v-if="tabItem.value === 'pass'" #default="{ ele: passItem, index }">
+                <div class="one-line-text mb-[8px] text-[var(--color-text-4)]">{{ passItem.label }}</div>
+                <div class="pass-rate-count-archived">
+                  <div class="text-[rgb(var(--primary-4))]" @click="goNavigation(passItem, index)">
+                    {{ hasPermission ? addCommasToNumber(passItem.value as number) : '-' }}
+                  </div>
+                  <div
+                    class="mr-[8px] text-center text-[var(--color-text-brand)]"
+                    @click="goNavigation(passItem, index, true)"
+                  >
+                    {{ hasPermission ? addCommasToNumber(passItem.archivedPassed || 0) : '-' }}
+                  </div>
+                </div>
+              </template>
+            </PassRatePie>
           </div>
         </div>
         <div class="mt-[16px] h-[148px]">
@@ -59,7 +74,9 @@
   import { workTestPlanRage } from '@/api/modules/workbench';
   import getVisualThemeColor from '@/config/chartTheme';
   import { useI18n } from '@/hooks/useI18n';
+  import useOpenNewPage from '@/hooks/useOpenNewPage';
   import useAppStore from '@/store/modules/app';
+  import { addCommasToNumber } from '@/utils';
 
   import type {
     SelectedCardItem,
@@ -67,9 +84,12 @@
     WorkTestPlanDetail,
     WorkTestPlanRageDetail,
   } from '@/models/workbench/homePage';
+  import { WorkNavValueEnum } from '@/enums/workbenchEnum';
 
   import { colorMapConfig, handlePieData, handleUpdateTabPie } from '../utils';
 
+  const { openNewPage } = useOpenNewPage();
+
   const { t } = useI18n();
   const appStore = useAppStore();
 
@@ -155,10 +175,12 @@
         {
           name: t('workbench.homePage.havePassed'),
           count: passed,
+          archivedPassed: 0,
         },
         {
           name: t('workbench.homePage.notPass'),
           count: notPassed,
+          archivedPassed: 0,
         },
       ];
 
@@ -249,6 +271,24 @@
     });
   }
 
+  function goNavigation(
+    item: { label: string; value: number | string; status?: string; route?: string },
+    index: number,
+    isArchived = false
+  ) {
+    let status;
+    if (isArchived) {
+      status = index === 0 ? WorkNavValueEnum.TEST_PLAN_PASSED_ARCHIVED : WorkNavValueEnum.TEST_PLAN_NOT_PASS_ARCHIVED;
+    } else {
+      status = item.status;
+    }
+
+    openNewPage(item.route, {
+      pId: projectId.value,
+      home: status,
+    });
+  }
+
   onMounted(() => {
     initTestPlanCount();
   });
@@ -296,4 +336,9 @@
   :deep(.arco-tabs-tab) {
     padding: 0 !important;
   }
+  .pass-rate-count-archived {
+    font-size: 20px;
+    gap: 8px;
+    @apply grid cursor-pointer grid-cols-2 font-medium;
+  }
 </style>