diff --git a/src/i18n/langs/cn.json b/src/i18n/langs/cn.json
index b3be1589b..07dfabd8c 100644
--- a/src/i18n/langs/cn.json
+++ b/src/i18n/langs/cn.json
@@ -649,7 +649,7 @@
     "appsList":"应用列表",
     "DatabaseAppCount": "数据库应用数量",
     "KubernetesAppCount": "Kubernetes应用数量",
-    "systemUserCount": "系统用户数量",
+    "systemUserCount": "系统用户",
     "upDownload": "上传下载",
     "uploadFile": "上传文件",
     "clipboardCopyPaste":"剪贴板复制粘贴",
@@ -1498,14 +1498,14 @@
       "DeleteOrgTitle": "请确保组织内的以下信息已删除",
       "DeleteOrgMsg": "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则",
       "OrgRole": "组织角色",
-      "users_amount": "用户数量",
-      "groups_amount": "用户组数量",
-      "assets_amount": "资产数量",
-      "admin_users_amount": "特权用户数量",
-      "system_users_amount": "系统用户数量",
-      "applications_amount": "应用数量",
-      "asset_perms_amount": "资产授权数量",
-      "app_perms_amount": "应用授权数量",
+      "users_amount": "用户",
+      "groups_amount": "用户组",
+      "assets_amount": "资产",
+      "admin_users_amount": "特权用户",
+      "system_users_amount": "系统用户",
+      "applications_amount": "应用",
+      "asset_perms_amount": "资产授权",
+      "app_perms_amount": "应用授权",
       "CreateOrgMsg": "请去组织详情内添加用户",
       "AddOrgMembers": "添加组织成员"
     },
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index bd2a3b54c..04cd567cb 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -417,7 +417,7 @@
     "isValid": "Is valid",
     "nav": {
       "APIKey": "API Key",
-      "Workspace": "Work",
+      "Workspace": "Workbench",
       "Navigation": "Navigation",
       "Console": "Console",
       "Audits": "Audit",
@@ -651,16 +651,21 @@
   },
   "route": {
     "": "",
+    "SystemSetting": "System setting",
     "Index": "Index",
     "Role": "Role",
     "Overview": "Overview",
+    "OrgRole": "Org role",
     "OrgRoles": "Organization roles",
     "SystemRole": "System roles",
     "RoleList": "Roles",
+    "RoleCreate": "Role create",
+    "RoleUpdate": "Role update",
+    "RoleDetail": "Role detail",
     "SessionDetail": "SessionDetail",
     "Accounts": "Accounts",
-    "AssetAccount": "Asset account",
-    "ApplicationAccount": "Application account",
+    "AssetAccount": "Asset Account",
+    "ApplicationAccount": "Application Account",
     "Ticket": "Tickets",
     "CommandConfirm": "Command confirm",
     "AdminUserCreate": "Admin user create",
@@ -730,7 +735,7 @@
     "FtpLog": "FTP Logs",
     "GatewayCreate": "Gateway create",
     "GatewayUpdate": "Gateway update",
-    "JobCenter": "Jobcenter",
+    "JobCenter": "Devops",
     "LabelCreate": "Label create",
     "LabelList": "Labels",
     "LabelUpdate": "Label update",
@@ -780,7 +785,7 @@
     "UserFirstLogin": "UserFirstLogin",
     "UserGroupCreate": "User group create",
     "UserGroupDetail": "User group detail",
-    "UserGroupList": "User Groups",
+    "UserGroupList": "Groups",
     "UserGroupUpdate": "User group update",
     "UserGuide": "UserGuide",
     "UserList": "Users",
@@ -1132,6 +1137,7 @@
   "users": {
     "InviteSuccess": "Invite success",
     "FileEncryptionPassword": "File encryption password",
+    "OrgRoles": "Org roles",
     "RoleUsers": "Role users",
     "RoleInfo": "Role info",
     "RolePerms": "Role perms",
@@ -1339,9 +1345,9 @@
     "AccountBackupPlan": {
       "Types": "Types",
       "Backup": "Backup",
-      "AccountBackupPlan": "Account backup plan",
-      "AccountBackupPlanreate": "Account backup plan",
-      "AccountBackupPlanUpdate": "Account backup plan",
+      "AccountBackupPlan": "Account Backup Plan",
+      "AccountBackupPlanCreate": "Account backup plan create",
+      "AccountBackupPlanUpdate": "Account backup plan update",
       "ExecutionDetail": "Execution detail",
       "MailRecipient": "Mail recipient",
       "IsSuccess": "Is success",
diff --git a/src/router/settings/index.js b/src/router/settings/index.js
index bb0edff74..c448654d4 100644
--- a/src/router/settings/index.js
+++ b/src/router/settings/index.js
@@ -51,7 +51,7 @@ export default {
     {
       path: '/settings/message',
       name: 'SysMessageSub',
-      component: () => import('@/views/settings/MessageSub'),
+      component: () => import('@/views/settings/Message'),
       meta: {
         title: i18n.t('setting.MessageSub'),
         icon: 'bell-o',
diff --git a/src/views/settings/MessageSub/SelectDialog.vue b/src/views/settings/Message/SelectDialog.vue
similarity index 100%
rename from src/views/settings/MessageSub/SelectDialog.vue
rename to src/views/settings/Message/SelectDialog.vue
diff --git a/src/views/settings/MessageSub/index.vue b/src/views/settings/Message/index.vue
similarity index 87%
rename from src/views/settings/MessageSub/index.vue
rename to src/views/settings/Message/index.vue
index 00473a9a3..eafc13da0 100644
--- a/src/views/settings/MessageSub/index.vue
+++ b/src/views/settings/Message/index.vue
@@ -10,27 +10,31 @@
         :stripe="true"
       >
         <el-table-column :label="$t('notifications.MessageType')" width="230">
-          <template #default="scope">
+          <template v-slot="scope">
             <span>{{ scope.row.value }}</span>
           </template>
         </el-table-column>
         <el-table-column v-for="header in receiveBackends" :key="header.id" :label="header.name_display" width="120">
-          <template #default="scope">
-            <el-checkbox
-              v-if="!scope.row.children"
-              v-model="scope.row.receiveBackends[header.name]"
-              :disabled="header.name === 'site_msg'"
-              @change="onCheckReceiveBackend(scope.row)"
-            />
+          <template v-slot="scope">
+            <span v-if="!scope.row.children">
+              <el-checkbox
+                v-if="header.name !== 'site_msg'"
+                v-model="scope.row.receiveBackends[header.name]"
+                @change="onCheckReceiveBackend(scope.row)"
+              />
+              <el-checkbox v-else :value="true" :disabled="true" />
+            </span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('notifications.Receivers')" show-overflow-tooltip>
-          <template #default="scope">
-            <span v-if="!scope.row.children">{{ scope.row.receivers.map(item => item.name).join(', ') }}</span>
+          <template v-slot="scope">
+            <span v-if="!scope.row.children">
+              {{ scope.row.receivers.map(item => item.name).join(', ') }}
+            </span>
           </template>
         </el-table-column>
         <el-table-column :label="$t('common.Actions')" width="200">
-          <template #default="scope">
+          <template v-slot="scope">
             <el-button v-if="!scope.row.children" type="small" @click="onOpenDialog(scope.row)">
               {{ $t('notifications.ChangeReceiver') }}
             </el-button>
diff --git a/src/views/settings/index.vue b/src/views/settings/index.vue
index ca00b42dc..127059583 100644
--- a/src/views/settings/index.vue
+++ b/src/views/settings/index.vue
@@ -21,7 +21,7 @@ import Security from './Security/index'
 import License from './License'
 import Other from './Other.vue'
 import Clean from './Clean'
-import SysMessageSub from './MessageSub'
+import SysMessageSub from './Message'
 import SMS from './SMS'
 
 export default {
diff --git a/src/views/users/Role/RoleDetail/RolePerms.vue b/src/views/users/Role/RoleDetail/RolePerms.vue
index b632206b6..67fec2245 100644
--- a/src/views/users/Role/RoleDetail/RolePerms.vue
+++ b/src/views/users/Role/RoleDetail/RolePerms.vue
@@ -6,7 +6,7 @@
           <el-button
             size="small"
             type="primary"
-            style="width: 100px;"
+            style="width: 100%;"
             :disabled="isDisabled"
             @click="updatePermissions"
           >
@@ -83,6 +83,7 @@ export default {
           'rbac.view_orgrolebinding', 'rbac.view_orgrole'
         ],
         'acls.loginacl': ['users.view_user'],
+        'acls.loginassetacl': ['users.view_user'],
         'assets.view_asset': ['assets.view_node'],
         'assets.commandfilterrule': ['assets.view_commandfilter'],
         'assets.gateway': ['assets.view_domain'],