From 41497802a7e553d06a84cd44a575d03f81855da4 Mon Sep 17 00:00:00 2001
From: GONGONGONG <506419689@qq.com>
Date: Tue, 20 Sep 2022 20:42:21 +0800
Subject: [PATCH] =?UTF-8?q?optimization:=20=E8=B5=84=E6=BA=90=E9=85=8D?=
 =?UTF-8?q?=E9=A2=9D-=E9=85=8D=E9=A2=9D=E7=99=BE=E5=88=86=E6=AF=94?=
 =?UTF-8?q?=E4=BE=8B=E5=90=AB=E4=B9=89=E4=B8=8D=E6=98=8E=E7=A1=AE=20(close?=
 =?UTF-8?q?d=20#1093)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev_log/2.2.23/daoqgong_202209202042.yaml          | 3 +++
 frontend/src/i18n/en.js                            | 4 ++--
 frontend/src/i18n/zh.js                            | 4 ++--
 frontend/src/views/plugin/resource-quota/edit.vue  | 4 ++--
 frontend/src/views/plugin/resource-quota/index.vue | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 dev_log/2.2.23/daoqgong_202209202042.yaml

diff --git a/dev_log/2.2.23/daoqgong_202209202042.yaml b/dev_log/2.2.23/daoqgong_202209202042.yaml
new file mode 100644
index 000000000..ff17b4966
--- /dev/null
+++ b/dev_log/2.2.23/daoqgong_202209202042.yaml
@@ -0,0 +1,3 @@
+---
+optimization:
+  - "资源配额-配额百分比例含义不明确 (closed #1093)"
diff --git a/frontend/src/i18n/en.js b/frontend/src/i18n/en.js
index 5e82e4d04..33b999a10 100644
--- a/frontend/src/i18n/en.js
+++ b/frontend/src/i18n/en.js
@@ -1016,13 +1016,13 @@ export default {
 
   // 资源配额
   资源配额: 'Resource quota',
-  限制最高CPU使用率: 'Limit maximum CPU usage',
-  限制最高内存使用率: 'Limit maximum memory usage',
   '业务：': 'Biz：',
   请输入关键词: '请输入关键词',
   总数运行中异常: 'Total / running / abnormal',
   CPU配额: 'CPU quota',
   内存配额: 'Memory quota',
+  CPU配额tip: 'Percentage of CPU usage limit of each plugin (total percentage, non-single-core percentage)',
+  内存配额tip: 'Percentage of memory usage cap per plugin',
   编辑资源配额: 'Edit resource quota',
   还原默认: 'Reset',
   CPU配额及单位: 'CPU quota(%)',
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 2f18fd086..a54dfab31 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -1017,13 +1017,13 @@ export default {
 
   // 资源配额
   资源配额: '资源配额',
-  限制最高CPU使用率: '限制最高 CPU 使用率',
-  限制最高内存使用率: '限制最高内存使用率',
   '业务：': '业务：',
   请输入关键词: '请输入关键词',
   总数运行中异常: '总数 / 运行中 / 异常',
   CPU配额: 'CPU 配额',
   内存配额: '内存配额',
+  CPU配额tip: '每个插件 CPU 使用率上限百分比（总占比，非单核占比）',
+  内存配额tip: '每个插件内存使用率上限百分比',
   编辑资源配额: '编辑资源配额',
   还原默认: '还原默认',
   CPU配额及单位: 'CPU 配额 (%)',
diff --git a/frontend/src/views/plugin/resource-quota/edit.vue b/frontend/src/views/plugin/resource-quota/edit.vue
index 608ea9a6c..6f075dba3 100644
--- a/frontend/src/views/plugin/resource-quota/edit.vue
+++ b/frontend/src/views/plugin/resource-quota/edit.vue
@@ -14,10 +14,10 @@
             <span>{{ $t('插件名称') }}</span>
           </div>
           <div class="form-head-item">
-            <span class="text-underline-dashed" v-bk-tooltips="$t('限制最高CPU使用率')">{{ $t('CPU配额') }}</span>
+            <span class="text-underline-dashed" v-bk-tooltips="$t('CPU配额tip')">{{ $t('CPU配额') }}</span>
           </div>
           <div class="form-head-item">
-            <span class="text-underline-dashed" v-bk-tooltips="$t('限制最高内存使用率')">{{ $t('内存配额') }}</span>
+            <span class="text-underline-dashed" v-bk-tooltips="$t('内存配额tip')">{{ $t('内存配额') }}</span>
           </div>
         </div>
         <div class="form-horizontal-item" v-for="item in pluginList" :key="item.plugin_name">
diff --git a/frontend/src/views/plugin/resource-quota/index.vue b/frontend/src/views/plugin/resource-quota/index.vue
index 925c6328d..e058e0173 100644
--- a/frontend/src/views/plugin/resource-quota/index.vue
+++ b/frontend/src/views/plugin/resource-quota/index.vue
@@ -143,8 +143,8 @@ export default class ResourceQuota extends Mixins(HeaderFilterMixins) {
   public pluginListMap: any = {};
   public pluginList: any[] = [];
   public headTipsMap = {
-    cpu: this.$t('限制最高CPU使用率'),
-    mem: this.$t('限制最高内存使用率'),
+    cpu: this.$t('CPU配额tip'),
+    mem: this.$t('内存配额tip'),
   };
   // public biz: number[] = [];
   public hasBizAuth = true;