From 35fdf5875b674c329b85a1bfac55ab59e033485d Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 25 Nov 2024 14:31:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=B7=A5=E4=BD=9C=E5=8F=B0):=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=95=B0=E9=87=8F=E5=8E=BB=E6=8E=89=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E7=8E=87=E5=A2=9E=E5=8A=A0=E5=B7=B2=E5=BD=92=E6=A1=A3=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/config/workbench.ts              |  2 +-
 .../homePage/components/defectMemberBar.vue   |  5 +--
 .../homePage/components/testPlanCount.vue     | 43 +++----------------
 3 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/frontend/src/config/workbench.ts b/frontend/src/config/workbench.ts
index 8a64339fb0..9d1039472b 100644
--- a/frontend/src/config/workbench.ts
+++ b/frontend/src/config/workbench.ts
@@ -186,7 +186,7 @@ export const defaultValueMap: Record<string, any> = {
     },
     complete: {
       defaultList: cloneDeep(defaultComplete),
-      color: ['#00C261', '#3370FF', '#D4D4D8'],
+      color: ['#00C261', '#3370FF', '#D4D4D8', '#FF9964'],
       defaultName: 'workbench.homePage.completeRate',
     },
   },
diff --git a/frontend/src/views/workbench/homePage/components/defectMemberBar.vue b/frontend/src/views/workbench/homePage/components/defectMemberBar.vue
index 7c203fdceb..bea1081f48 100644
--- a/frontend/src/views/workbench/homePage/components/defectMemberBar.vue
+++ b/frontend/src/views/workbench/homePage/components/defectMemberBar.vue
@@ -97,10 +97,7 @@
   const hasPermission = ref<boolean>(false);
 
   function handleData(detail: OverViewOfProject) {
-    options.value = getCommonBarOptions(detail.xaxis.length >= 7, [
-      ...defectStatusColor,
-      ...getColorScheme(detail.xaxis.length),
-    ]);
+    options.value = getCommonBarOptions(detail.xaxis.length >= 7, [...defectStatusColor, ...getColorScheme(13)]);
     const { invisible, text } = handleNoDataDisplay(detail.xaxis, hasPermission.value);
     options.value.graphic.invisible = invisible;
     options.value.graphic.style.text = text;
diff --git a/frontend/src/views/workbench/homePage/components/testPlanCount.vue b/frontend/src/views/workbench/homePage/components/testPlanCount.vue
index d82b8ea32b..bd86beff90 100644
--- a/frontend/src/views/workbench/homePage/components/testPlanCount.vue
+++ b/frontend/src/views/workbench/homePage/components/testPlanCount.vue
@@ -20,7 +20,7 @@
       </div>
     </div>
     <div class="mt-[16px]">
-      <TabCard :content-tab-list="testPlanTabList" not-has-padding hidden-border min-width="270px">
+      <TabCard :content-tab-list="testPlanTabList" not-has-padding hidden-border min-width="290px">
         <template #item="{ item: tabItem }">
           <div class="w-full">
             <PassRatePie
@@ -90,12 +90,9 @@
     })
   );
 
-  const executionOptions = ref<Record<string, any>>({});
   const passOptions = ref<Record<string, any>>({});
   const completeOptions = ref<Record<string, any>>({});
 
-  // 执行率
-  const executionValueList = ref<{ value: number | string; label: string; name: string }[]>([]);
   // 通过率
   const passValueList = ref<{ value: number | string; label: string; name: string }[]>([]);
 
@@ -104,12 +101,6 @@
 
   const testPlanTabList = computed(() => {
     return [
-      {
-        label: '',
-        value: 'execution',
-        valueList: executionValueList.value,
-        options: { ...executionOptions.value },
-      },
       {
         label: '',
         value: 'pass',
@@ -138,7 +129,7 @@
         projectId: innerProjectIds.value[0],
       };
       const detail: WorkTestPlanRageDetail = await workTestPlanRage(params);
-      const { unExecute, executed, passed, notPassed, finished, running, prepared, archived, errorCode } = detail;
+      const { passed, notPassed, finished, running, prepared, archived, errorCode } = detail;
       hasPermission.value = errorCode !== 109001;
 
       const passRate = passed + notPassed > 0 ? parseFloat(((passed / (passed + notPassed)) * 100).toFixed(2)) : 0;
@@ -172,7 +163,7 @@
         percentValue: total > 0 ? `${((item.count / total) * 100).toFixed(2)}%` : '0%',
       }));
 
-      const completeRate = total > 0 ? parseFloat(((finished / total) * 100).toFixed(2)) : 0;
+      const completeRate = total > 0 ? parseFloat((((finished + archived) / total) * 100).toFixed(2)) : 0;
 
       const completeData = [
         {
@@ -191,36 +182,14 @@
           name: t('common.notStarted'),
           count: prepared,
         },
-      ];
-
-      const executeRate = finished + running > 0 ? parseFloat((((finished + running) / total) * 100).toFixed(2)) : 0;
-      const executeData: {
-        name: string;
-        count: number;
-      }[] = [
         {
-          name: t('workbench.homePage.executeRate'),
-          count: executeRate,
-        },
-        {
-          name: t('common.unExecute'),
-          count: unExecute,
-        },
-        {
-          name: t('common.executed'),
-          count: executed,
+          name: t('common.archived'),
+          count: archived,
         },
       ];
 
       testPlanCountOptions.value = handlePieData(props.item.key, hasPermission.value, listStatusPercentList);
 
-      // 执行率
-      const { options: executedOptions, valueList: executedList } = handleUpdateTabPie(
-        executeData,
-        hasPermission.value,
-        `${props.item.key}-execute`
-      );
-
       // 通过率
       const { options: passedOptions, valueList: passList } = handleUpdateTabPie(
         passData,
@@ -235,11 +204,9 @@
         `${props.item.key}-complete`
       );
 
-      executionValueList.value = executedList;
       passValueList.value = passList;
       completeValueList.value = completeList;
 
-      executionOptions.value = executedOptions;
       passOptions.value = passedOptions;
       completeOptions.value = comOptions;
     } catch (error) {