From c3af183fdb2dca63ec2446518ffed92b10539592 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 22 Jul 2021 17:27:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E4=BB=BB=E5=8A=A1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/modules/permission.js      | 1 +
 frontend/src/views/system/task/TaskRecord.vue | 1 +
 frontend/src/views/system/task/dataset.vue    | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/store/modules/permission.js b/frontend/src/store/modules/permission.js
index 260db2ad06..e8636fadcc 100644
--- a/frontend/src/store/modules/permission.js
+++ b/frontend/src/store/modules/permission.js
@@ -72,6 +72,7 @@ export const fillMeta = (router) => {
   router.name.includes('system-user-form') && (router.meta.activeMenu = '/system/user')
   router.name.includes('system-role-form') && (router.meta.activeMenu = '/system/role')
   router.name.includes('system-dept-form') && (router.meta.activeMenu = '/system/dept')
+  router.name.includes('sys-task-dataset') && (router.meta.activeMenu = '/system/system-task')
   // return router
 }
 
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index c717c1cbcc..c73d2e6e2d 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -115,6 +115,7 @@ export default {
   },
   methods: {
     msg2Current(routerParam) {
+      if (!routerParam || !routerParam.taskId) return
       const taskId = routerParam.taskId
       // console.log(taskId)
       const current_condition = {
diff --git a/frontend/src/views/system/task/dataset.vue b/frontend/src/views/system/task/dataset.vue
index beed4c80b6..66dcdeed6a 100644
--- a/frontend/src/views/system/task/dataset.vue
+++ b/frontend/src/views/system/task/dataset.vue
@@ -51,10 +51,10 @@ export default {
           if (routerParam.sourceParam) {
             try {
               const msgParam = JSON.parse(routerParam.sourceParam)
-              this.param = msgParam.tableId
+              // this.param = msgParam.tableId
               this.tabActive = 'TaskRecord'
               this.$nextTick(() => {
-                this.$refs.task_record && this.$refs.task_record.msg2Current && this.$refs.task_record.msg2Current(routerParam.sourceParam)
+                this.$refs.task_record && this.$refs.task_record.msg2Current && this.$refs.task_record.msg2Current(msgParam)
               })
             } catch (error) {
               console.error(error)