From 58183fa597297bd67a81577b63535151872d8b2f Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 20 Jul 2023 10:10:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/menu.ts                                      | 2 +-
 src/views/link/DashBoard/components/Network.vue         | 1 -
 src/views/system/Role/Detail/components/PermissTree.vue | 9 +++------
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/router/menu.ts b/src/router/menu.ts
index f7d68cd4..7f7c7614 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -2,7 +2,7 @@ export const LoginPath = '/user/login'
 export const InitHomePath = '/init-home'
 export const AccountCenterBindPath = '/account/center/bind'
 export const InitLicense = '/init-license'
-export const NotificationSubscriptionCode = 'account/NotificationSubscription'
+export const NotificationSubscriptionCode = 'message-subscribe'
 export const NotificationRecordCode = 'account/NotificationRecord'
 export const OauthPath = '/oauth'
 
diff --git a/src/views/link/DashBoard/components/Network.vue b/src/views/link/DashBoard/components/Network.vue
index 65e4f51b..35a8f4e6 100644
--- a/src/views/link/DashBoard/components/Network.vue
+++ b/src/views/link/DashBoard/components/Network.vue
@@ -220,7 +220,6 @@ watch(
 watchEffect(() => {
   const time = data.value.time.time
   if (time && Array.isArray(time) && time.length === 2 && time[0] && props.serviceId) {
-    console.log(data.value)
     getNetworkEcharts(data.value);
   }
 })
diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue
index 8071c40a..0f409216 100644
--- a/src/views/system/Role/Detail/components/PermissTree.vue
+++ b/src/views/system/Role/Detail/components/PermissTree.vue
@@ -112,6 +112,7 @@ import {
 } from '@/utils/consts'
 import { isNoCommunity } from '@/utils/utils'
 import {permissionsGranted, useIndirectMenusMap} from "@/views/system/Role/Detail/components/util";
+import {NotificationSubscriptionCode} from "@/router/menu";
 
 const emits = defineEmits(['update:selectItems']);
 const route = useRoute();
@@ -279,12 +280,8 @@ function getAllPermiss() {
     getPrimissTree_api(id).then((resp) => {
         const _result = resp.result
         // 默认选中个人中心相关设置
-        tableData.value = _result.map((item: { code: string , buttons: any[], granted: boolean}) => {
-        //   if (item.code === USER_CENTER_MENU_CODE) {
-        //     item.granted = true
-        //     item.buttons = item.buttons.map( b => ({...b, granted: true, enabled: true}))
-        //   }
-          return item
+        tableData.value = _result.filter((item: { code: string , buttons: any[], granted: boolean}) => {
+          return (item.code !== NotificationSubscriptionCode)
         });
 
         treeToSimple(tableData.value); // 表格数据扁平化