From b3de5b92b43321a199a23fddb7f02e6f3bbd6245 Mon Sep 17 00:00:00 2001
From: teukkk <mengyuan.lv@fit2cloud.com>
Date: Sat, 15 Jun 2024 10:15:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2=E7=BB=86=E8=8A=82=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../testPlan/detail/executeHistory/index.vue  | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue b/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
index bc7f9cfc4e..c81c5d5a8b 100644
--- a/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/executeHistory/index.vue
@@ -1,17 +1,20 @@
 <template>
   <div class="p-[16px]">
     <ms-base-table v-bind="propsRes" no-disable v-on="propsEvent">
-      <template #[FilterSlotNameEnum.API_TEST_CASE_API_REPORT_EXECUTE_RESULT]="{ filterContent }">
+      <template #[FilterSlotNameEnum.TEST_PLAN_STATUS_FILTER]="{ filterContent }">
         <ExecutionStatus :module-type="ReportEnum.API_REPORT" :status="filterContent.value" />
       </template>
       <template #triggerMode="{ record }">
         <span>{{ t(TriggerModeLabel[record.triggerMode as keyof typeof TriggerModeLabel]) }}</span>
       </template>
       <template #lastExecResult="{ record }">
-        <ExecutionStatus :status="record.execStatus" :module-type="ReportEnum.API_REPORT" />
+        <ExecutionStatus v-if="record.execStatus" :status="record.execStatus" :module-type="ReportEnum.API_REPORT" />
       </template>
       <template #executionStartAndEndTime="{ record }">
-        <div> {{ record.startTime }} 至 {{ record.endTime ?? '-' }} </div>
+        <div>
+          {{ dayjs(record.startTime).format('YYYY-MM-DD HH:mm:ss') }} 至
+          {{ record.endTime ? dayjs(record.endTime).format('YYYY-MM-DD HH:mm:ss') : '-' }}
+        </div>
       </template>
       <template #operation="{ record }">
         <a-tooltip :content="t('project.executionHistory.cleared')" :disabled="!record.deleted">
@@ -44,13 +47,11 @@
   import { hasAnyPermission } from '@/utils/permission';
 
   import type { PlanDetailExecuteHistoryItem } from '@/models/testPlan/testPlan';
-  import { LastExecuteResults } from '@/enums/caseEnum';
-  import { ReportEnum, TriggerModeLabel } from '@/enums/reportEnum';
+  import { PlanReportStatus, ReportEnum, TriggerModeLabel } from '@/enums/reportEnum';
   import { TestPlanRouteEnum } from '@/enums/routeEnum';
   import { FilterSlotNameEnum } from '@/enums/tableFilterEnum';
 
   import { triggerModeOptions } from '@/views/api-test/report/utils';
-  import { executionResultMap } from '@/views/case-management/caseManagementFeature/components/utils';
 
   const { t } = useI18n();
   const route = useRoute();
@@ -58,6 +59,15 @@
 
   const planId = ref(route.query.id as string);
 
+  const statusResultOptions = computed(() => {
+    return Object.keys(PlanReportStatus).map((key) => {
+      return {
+        value: key,
+        label: PlanReportStatus[key].statusText,
+      };
+    });
+  });
+
   const columns: MsTableColumn = [
     {
       title: 'apiTestManagement.order',
@@ -80,10 +90,8 @@
       dataIndex: 'execStatus',
       slotName: 'lastExecResult',
       filterConfig: {
-        valueKey: 'key',
-        labelKey: 'statusText',
-        options: Object.values(executionResultMap),
-        filterSlotName: FilterSlotNameEnum.CASE_MANAGEMENT_EXECUTE_RESULT,
+        options: statusResultOptions.value,
+        filterSlotName: FilterSlotNameEnum.TEST_PLAN_STATUS_FILTER,
       },
       width: 150,
     },
@@ -97,7 +105,7 @@
       title: 'testPlan.executeHistory.executionStartAndEndTime',
       dataIndex: 'startTime',
       slotName: 'executionStartAndEndTime',
-      width: 200,
+      width: 300,
     },
     {
       title: 'common.operation',