From a46d185cef6f00080b08ab0ed5bd94270970989b Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Mon, 1 Apr 2024 18:18:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?tab=E9=A1=B5=E5=88=87=E6=8D=A2=E5=8F=AF=E8=83=BD=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/dataFilling/form/index.vue   | 10 +++++++---
 core/frontend/src/views/dataFilling/myTask/index.vue | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/core/frontend/src/views/dataFilling/form/index.vue b/core/frontend/src/views/dataFilling/form/index.vue
index bad6a293cb..2b36a99de9 100644
--- a/core/frontend/src/views/dataFilling/form/index.vue
+++ b/core/frontend/src/views/dataFilling/form/index.vue
@@ -194,6 +194,11 @@ export default {
           this.displayFormData = res.data
         })
       }
+    },
+    tabClick() {
+      if (this.activeName === 'my-tasks') {
+        this.$router.push('/data-filling/my-jobs')
+      }
     }
   }
 }
@@ -208,15 +213,14 @@ export default {
       <el-tabs
         v-model="activeName"
         class="tab-panel"
+        @tab-click="tabClick"
       >
         <el-tab-pane
           v-if="hasPermission(['my-data-filling:manage'])"
           name="my-tasks"
         >
           <span slot="label">
-            <router-link to="/data-filling/my-jobs">
-              我的填报
-            </router-link>
+            我的填报
           </span>
         </el-tab-pane>
 
diff --git a/core/frontend/src/views/dataFilling/myTask/index.vue b/core/frontend/src/views/dataFilling/myTask/index.vue
index 47a88cca1f..b6f18c758f 100644
--- a/core/frontend/src/views/dataFilling/myTask/index.vue
+++ b/core/frontend/src/views/dataFilling/myTask/index.vue
@@ -282,6 +282,11 @@ export default {
       } else {
         this.searchTableMyTaskData()
       }
+    },
+    tabClick() {
+      if (this.activeName === 'forms') {
+        this.$router.push('/data-filling/forms')
+      }
     }
 
   }
@@ -298,6 +303,7 @@ export default {
       <el-tabs
         v-model="activeName"
         class="tab-panel"
+        @tab-click="tabClick"
       >
         <el-tab-pane
           name="my-tasks"
@@ -324,9 +330,7 @@ export default {
           <span
             slot="label"
           >
-            <router-link to="/data-filling/forms">
-              表单管理
-            </router-link>
+            表单管理
           </span>
         </el-tab-pane>
       </el-tabs>