From b9cd54127c8d3429e947ba9b6a512cd491400526 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 16 May 2022 13:05:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=97=B6=E6=9C=AA=E9=80=89=E6=8B=A9=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E5=8F=B0=E6=9D=83=E9=99=90=E6=B2=A1=E6=9C=89=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=BB=84=E7=BB=87bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/Role/RoleDetail/RoleInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/users/Role/RoleDetail/RoleInfo.vue b/src/views/users/Role/RoleDetail/RoleInfo.vue index baf3a5f4a..d8cdf7a08 100644 --- a/src/views/users/Role/RoleDetail/RoleInfo.vue +++ b/src/views/users/Role/RoleDetail/RoleInfo.vue @@ -86,7 +86,7 @@ export default { 'tickets.change_ticketflow': ['users.view_user', 'tickets.view_ticket'], 'tickets.view_ticket': [ 'assets.match_asset', 'assets.match_node', 'assets.match_systemuser', - 'applications.match_application' + 'applications.match_application', 'rbac.view_workbench' ], 'tickets.view_ticketflow': ['tickets.view_ticket'], 'users.invite_user': [ From 26106457038dcb6732d014df3d0798f21d2dadde Mon Sep 17 00:00:00 2001 From: jiangweidong Date: Sun, 24 Apr 2022 10:17:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E4=BA=91=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E6=94=AF=E6=8C=81Fusion=20Compute=E7=A7=81?= =?UTF-8?q?=E6=9C=89=E4=BA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/langs/en.json | 1 + src/i18n/langs/ja.json | 1 + src/i18n/langs/zh.json | 1 + src/views/assets/Cloud/Account/AccountList.vue | 6 +++++- src/views/assets/Cloud/const.js | 6 ++++++ 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json index d982b2e6e..a7c90e9ed 100644 --- a/src/i18n/langs/en.json +++ b/src/i18n/langs/en.json @@ -1379,6 +1379,7 @@ "HuaweiPrivatecloud": "Huawei Private Cloud", "OpenStack": "OpenStack", "GCP": "Google Cloud Platform", + "FC": "Fusion Compute", "AWS_China": "AWS(China)", "AWS_Int": "AWS(International)", "HuaweiCloud": "Huawei Cloud", diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json index e923c126b..ec9a1cfb9 100644 --- a/src/i18n/langs/ja.json +++ b/src/i18n/langs/ja.json @@ -1422,6 +1422,7 @@ "HuaweiPrivatecloud": "ファーウェイプライベートクラウド", "OpenStack": "OpenStack", "GCP": "Googleクラウド", + "FC": "Fusion Compute", "AWS_China": "AWS(中国)", "AWS_Int": "AWS (国際)", "HuaweiCloud": "ファーウェイ雲", diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json index 2ea7e630d..706b0dd2b 100644 --- a/src/i18n/langs/zh.json +++ b/src/i18n/langs/zh.json @@ -1423,6 +1423,7 @@ "HuaweiPrivatecloud": "华为私有云", "OpenStack": "OpenStack", "GCP": "谷歌云", + "FC": "Fusion Compute", "AWS_China": "AWS(中国)", "AWS_Int": "AWS(国际)", "HuaweiCloud": "华为云", diff --git a/src/views/assets/Cloud/Account/AccountList.vue b/src/views/assets/Cloud/Account/AccountList.vue index b83ab2390..823b4a956 100644 --- a/src/views/assets/Cloud/Account/AccountList.vue +++ b/src/views/assets/Cloud/Account/AccountList.vue @@ -4,7 +4,7 @@