From 6e6d83681cb17aae2f452abf3a49b25b384fc001 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 1 Sep 2021 19:17:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=BC=E5=87=BAhtml=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json                                    | 2 +-
 .../comonents/report/detail/TestPlanReportContent.vue    | 2 +-
 .../report/detail/TestPlanReportNavigationBar.vue        | 9 ++++++++-
 .../comonents/report/detail/component/TabPaneCount.vue   | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 08b8939883..fd85f4983c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "export NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build",
+    "build": "vue-cli-service build",
     "build-win": "SET NODE_OPTIONS=--max_old_space_size=4096 && vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
index 0f1fa71383..6005a49ec6 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportContent.vue
@@ -11,7 +11,7 @@
         <test-plan-load-report v-if="loadEnable" :is-db="isDb" :share-id="shareId" :is-share="isShare" :is-template="isTemplate" :report="report" :plan-id="planId"/>
       </el-card>
     </el-main>
-    <test-plan-report-navigation-bar/>
+    <test-plan-report-navigation-bar :is-template="isTemplate"/>
   </div>
 </template>
 
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
index c3fd1eb762..38aa5a85b1 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/TestPlanReportNavigationBar.vue
@@ -19,6 +19,9 @@ import MsDrawer from "@/business/components/common/components/MsDrawer";
 export default {
   name: "TestPlanReportNavigationBar",
   components: {MsDrawer},
+  props: {
+    isTemplate: Boolean,
+  },
   data() {
     return {
       asideHidden: true,
@@ -50,7 +53,11 @@ export default {
   watch: {
     activeName() {
       let url = new URL(window.location.href);
-      window.location.href = url.origin + '#' + this.activeName;
+      if (this.isTemplate) {
+        window.location.href = window.location.href.split('#')[0] + '#' + this.activeName;
+      } else {
+        window.location.href = url.origin + '#' + this.activeName;
+      }
     }
   }
 }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TabPaneCount.vue b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TabPaneCount.vue
index 3012e9773b..5ea8bbe976 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TabPaneCount.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/detail/component/TabPaneCount.vue
@@ -20,7 +20,7 @@ export default {
   /*color: white;*/
   color: #783887;
   height: 20px;
-  border: 0px;
+  border: 0px !important;
   /*border-radius: 42%;*/
   /*margin-left: 4px;*/
 }