From 7b6ebc3132b2ea242ffd5a216dc0c4dc75fcadf8 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Mon, 9 Sep 2024 17:09:39 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92&?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86):=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=8E=AF=E5=A2=83host=E8=B0=83=E6=95=B4&?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=B7=B3=E8=BD=AC=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/page-layout.vue            |  2 +-
 .../components/bug-detail-drawer.vue           |  1 +
 .../components/caseDetailDrawer.vue            |  1 +
 .../components/caseTable.vue                   |  6 +++---
 .../components/envParams/HostTab.vue           |  5 +----
 .../views/test-plan/testPlan/detail/index.vue  | 18 ++++++++++--------
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/frontend/src/layout/page-layout.vue b/frontend/src/layout/page-layout.vue
index 586e0895bc..e83ae155b0 100644
--- a/frontend/src/layout/page-layout.vue
+++ b/frontend/src/layout/page-layout.vue
@@ -15,7 +15,7 @@
         </Suspense> -->
         <Suspense>
           <keep-alive :include="cacheStore.cacheViews">
-            <component :is="Component" :key="route.fullPath" />
+            <component :is="Component" :key="route.name" />
           </keep-alive>
         </Suspense>
       </div>
diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
index b116bdfd96..9001b399b8 100644
--- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue
+++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue
@@ -452,6 +452,7 @@
   });
 
   function updateHandler() {
+    showDrawerVisible.value = false;
     router.push({
       name: RouteEnum.BUG_MANAGEMENT_DETAIL,
       query: {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
index 2f0404027d..54d6b63672 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseDetailDrawer.vue
@@ -359,6 +359,7 @@
   }
 
   function updateHandler(type: string) {
+    showDrawerVisible.value = false;
     router.push({
       name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE_DETAIL,
       query: {
diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
index f438237d18..272aff1113 100644
--- a/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
+++ b/frontend/src/views/case-management/caseManagementFeature/components/caseTable.vue
@@ -1792,12 +1792,12 @@
   }
 
   async function mountedLoad() {
+    await initFilter();
+    await initData();
+    getCaseExportData();
     if (route.query.id) {
       showCaseDetail(route.query.id as string, -1);
     }
-    await initFilter();
-    initData();
-    getCaseExportData();
   }
 
   watch(
diff --git a/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue b/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
index 2a0374c252..227a676688 100644
--- a/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
+++ b/frontend/src/views/project-management/environmental/components/envParams/HostTab.vue
@@ -78,10 +78,7 @@
       type: 'input',
       label: 'project.environmental.host.ip',
       placeholder: 'project.environmental.host.ipPlaceholder',
-      rules: [
-        { required: true, message: t('project.environmental.host.ipIsRequire') },
-        { notRepeat: true, message: t('project.environmental.host.ipNotRepeat') },
-      ],
+      rules: [{ required: true, message: t('project.environmental.host.ipIsRequire') }],
     },
     {
       field: 'domain',
diff --git a/frontend/src/views/test-plan/testPlan/detail/index.vue b/frontend/src/views/test-plan/testPlan/detail/index.vue
index cd18aaa645..609a6ca440 100644
--- a/frontend/src/views/test-plan/testPlan/detail/index.vue
+++ b/frontend/src/views/test-plan/testPlan/detail/index.vue
@@ -408,15 +408,22 @@
 
   const showPlanDrawer = ref(false);
 
-  // 生成报告  TODO 等待联调 后台要改接口
+  // 生成报告
   async function handleGenerateReport() {
     try {
       loading.value = true;
-      await generateReport({
+      const reportId = await generateReport({
         projectId: appStore.currentProjectId,
         testPlanId: detail.value.id as string,
         triggerMode: 'MANUAL',
       });
+      router.push({
+        name: TestPlanRouteEnum.TEST_PLAN_REPORT_DETAIL,
+        query: {
+          id: reportId,
+          type: testPlanTypeEnum.TEST_PLAN,
+        },
+      });
       Message.success(t('testPlan.testPlanDetail.successfullyGenerated'));
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -425,14 +432,9 @@
       loading.value = false;
     }
   }
-  // 自定义报告  TODO 等待联调 后台缺接口
+  // 自定义报告
   function configReportHandler() {
     try {
-      // await generateReport({
-      //   projectId: appStore.currentProjectId,
-      //   testPlanId: record.id,
-      //   triggerMode: 'MANUAL',
-      // });
       router.push({
         name: TestPlanRouteEnum.TEST_PLAN_INDEX_CONFIG,
         query: {