From 98f1dc88ff5b3657c4b357511df73344e2fdabfe Mon Sep 17 00:00:00 2001
From: "Jiangjie.Bai" <bugatti_it@163.com>
Date: Thu, 10 Mar 2022 07:00:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=A0=91(1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/audit/index.js                    |  4 ++--
 src/router/console/index.js                  |  4 ++--
 src/router/workspace/index.js                |  2 +-
 src/utils/jms.js                             |  6 +++---
 src/views/dashboard/index.vue                |  2 +-
 src/views/users/Role/RoleDetail/RoleInfo.vue | 16 ++++++++++++----
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/router/audit/index.js b/src/router/audit/index.js
index b4f60c5bc..f7d2aec0f 100644
--- a/src/router/audit/index.js
+++ b/src/router/audit/index.js
@@ -14,7 +14,7 @@ export default {
     title: i18n.t('common.nav.Audits'),
     icon: 'el-icon-s-claim',
     showNavSwitcher: true,
-    permissions: ['rbac.view_auditview'],
+    permissions: ['rbac.view_audit'],
     view: 'audit'
   },
   children: [
@@ -24,7 +24,7 @@ export default {
       name: 'AuditDashboard',
       meta: {
         icon: 'dashboard',
-        title: i18n.t('route.Overview'),
+        title: i18n.t('route.Dashboard'),
         permissions: [],
         resource: 'common',
         app: 'common'
diff --git a/src/router/console/index.js b/src/router/console/index.js
index 3d4cda437..6ffc37327 100644
--- a/src/router/console/index.js
+++ b/src/router/console/index.js
@@ -21,7 +21,7 @@ export default {
     view: 'console',
     type: 'view',
     showNavSwitcher: true,
-    permissions: ['rbac.view_adminview']
+    permissions: ['rbac.view_console']
   },
   children: [
     {
@@ -30,7 +30,7 @@ export default {
       name: 'AdminDashboard',
       meta: {
         icon: 'dashboard',
-        title: i18n.t('route.Overview'),
+        title: i18n.t('route.Dashboard'),
         permissions: []
       }
     },
diff --git a/src/router/workspace/index.js b/src/router/workspace/index.js
index 3a775f57d..abe50e5f0 100644
--- a/src/router/workspace/index.js
+++ b/src/router/workspace/index.js
@@ -15,7 +15,7 @@ export default {
     icon: 'el-icon-user-solid',
     showNavSwitcher: true,
     showOrganization: true,
-    permissions: ['rbac.view_userview']
+    permissions: ['rbac.view_workspace']
   },
   children: [
     // 404 page must be placed at the end !!!
diff --git a/src/utils/jms.js b/src/utils/jms.js
index e1da144fa..d23ae24cd 100644
--- a/src/utils/jms.js
+++ b/src/utils/jms.js
@@ -80,9 +80,9 @@ export function hasActionPerm(route, action) {
 }
 
 const viewRequirePermsMapper = {
-  console: 'rbac.view_adminview',
-  audit: 'rbac.view_auditview',
-  workspace: 'rbac.view_userview'
+  console: 'rbac.view_console',
+  audit: 'rbac.view_audit',
+  workspace: 'rbac.view_workspace'
 }
 
 export function getViewRequirePerms(view) {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index f4d009835..d134ddd7d 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Page>
-    <div v-if="$hasPerm('rbac.view_resourcestatistics')">
+    <div v-if="$hasPerm('rbac.view_dashboard')">
       <Announcement />
       <ResourceSummary />
       <DatesLoginSummary />
diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue
index 8e9748af3..d90315677 100644
--- a/src/views/users/Role/RoleDetail/RoleInfo.vue
+++ b/src/views/users/Role/RoleDetail/RoleInfo.vue
@@ -73,9 +73,9 @@ export default {
         }
       },
       viewPermMapper: [
-        ['view_console', ['rbac.view_adminview', 'rbac.view_resourcestatistics']],
-        ['view_audit', ['rbac.view_auditview', 'rbac.view_resourcestatistics']],
-        ['view_workspace', ['rbac.view_userview']]
+        ['view_console', ['rbac.view_console', 'rbac.view_dashboard']],
+        ['view_audit', ['rbac.view_audit', 'rbac.view_dashboard']],
+        ['view_workspace', ['rbac.view_workspace']]
       ]
     }
   },
@@ -209,7 +209,15 @@ export default {
         const ztree = this.$refs.tree.zTree
         const checkedNodes = ztree.getCheckedNodes()
         const permNodes = checkedNodes.filter(node => !node.isParent)
-        const permIds = permNodes.map(node => node.id)
+        const permIds = []
+        for (const permNode of permNodes) {
+          let id = permNode.id
+          if (id.indexOf('#') !== -1) {
+            id = id.split('#')[1]
+          }
+          permIds.push((id))
+        }
+        // const permIds = permNodes.map(node => node.id)
 
         const roleDetailUrl = `/api/v1/rbac/${this.object.scope}-roles/${this.object.id}/`
         const data = {