From a8cdd3475855ec7110add5c93e9911ced7242568 Mon Sep 17 00:00:00 2001 From: chenshihai Date: Wed, 17 Aug 2022 11:47:58 +0800 Subject: [PATCH] Resources Management --- web_src/vuepages/langs/config/en-US.js | 3 ++- web_src/vuepages/langs/config/zh-CN.js | 11 ++++++----- .../pages/resources/components/QueueDialog.vue | 4 ++-- .../pages/resources/components/SceneDialog.vue | 4 ++-- .../resources/components/SpecificationDialog.vue | 2 +- web_src/vuepages/pages/resources/scene/index.vue | 2 +- .../vuepages/pages/resources/specification/index.vue | 4 ++-- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/web_src/vuepages/langs/config/en-US.js b/web_src/vuepages/langs/config/en-US.js index 1d17297d0..c25b66b5a 100644 --- a/web_src/vuepages/langs/config/en-US.js +++ b/web_src/vuepages/langs/config/en-US.js @@ -5,6 +5,7 @@ const en = { confirm: 'Confirm', cancel: 'Cancel', + confirm1: 'Confirm', pleaseCompleteTheInformationFirst: 'Please Complete the Information first!', submittedSuccessfully: 'Submitted Successfully!', submittedFailed: 'Submitted Failed!', @@ -112,7 +113,7 @@ const en = { cardsTotalNum: 'Cards Total Number', accCardsNum: 'Acc Cards Number', remark: 'Remark', - pleaseEnterRemark: 'Please Enter Remark', + pleaseEnterRemark: 'Please Enter Remark(The maximum length shall not exceed 255)', pleaseEnterPositiveIntegerCardsTotalNum: 'Please Enter Positive Integer Cards Total Number!', addResSpecificationAndPriceInfo: 'Add Resources Specification and Price Info', addResSpecificationBtn: 'Add Resources Specification', diff --git a/web_src/vuepages/langs/config/zh-CN.js b/web_src/vuepages/langs/config/zh-CN.js index 6952ba8f0..c593cd684 100644 --- a/web_src/vuepages/langs/config/zh-CN.js +++ b/web_src/vuepages/langs/config/zh-CN.js @@ -3,8 +3,9 @@ const zh = { noData: '暂无数据', date: '日期', - confirm: '确认', + confirm: '确定', cancel: '取消', + confirm1: '确认', pleaseCompleteTheInformationFirst: '请先完善信息！', submittedSuccessfully: '提交成功！', submittedFailed: '提交失败！', @@ -112,7 +113,7 @@ const zh = { cardsTotalNum: '卡数', accCardsNum: '卡数', remark: '备注', - pleaseEnterRemark: '请输入备注', + pleaseEnterRemark: '请输入备注(最大长度不超过255)', pleaseEnterPositiveIntegerCardsTotalNum: '请输入正整数的卡数！', addResSpecificationAndPriceInfo: '新增资源规格和单价信息', addResSpecificationBtn: '新增资源规格', @@ -127,11 +128,11 @@ const zh = { shareMem: '共享内存', unitPrice: '单价', point_hr: '积分/时', - onShelfConfirm: '请确认是否上架该规格？', - offShelfConfirm: '请确认是否下架该规格？', + onShelfConfirm: '请确认上架该规格？', + offShelfConfirm: '请确认下架该规格？', onShelfCode1001: '上架失败，资源池（队列）不可用。', offShelfDlgTip1: '当前资源规格已在以下场景中使用：', - offShelfDlgTip2: '请确认是否进行下架操作？', + offShelfDlgTip2: '请确认进行下架操作？', resSceneManagement: '算力资源应用场景管理', addResScene: '新建算力资源应用场景', addResSceneBtn: '新增应用场景', diff --git a/web_src/vuepages/pages/resources/components/QueueDialog.vue b/web_src/vuepages/pages/resources/components/QueueDialog.vue index b49e5a93d..6e44e45c0 100644 --- a/web_src/vuepages/pages/resources/components/QueueDialog.vue +++ b/web_src/vuepages/pages/resources/components/QueueDialog.vue @@ -10,7 +10,7 @@ {{ $t('resourcesManagement.resQueueName') }}
- +
@@ -64,7 +64,7 @@
{{ $t('resourcesManagement.remark') }}
-
diff --git a/web_src/vuepages/pages/resources/components/SceneDialog.vue b/web_src/vuepages/pages/resources/components/SceneDialog.vue index 6d3190a25..81507c368 100644 --- a/web_src/vuepages/pages/resources/components/SceneDialog.vue +++ b/web_src/vuepages/pages/resources/components/SceneDialog.vue @@ -10,7 +10,7 @@ {{ $t('resourcesManagement.resSceneName') }}
- +
@@ -38,7 +38,7 @@ {{ $t('resourcesManagement.exclusiveOrg') }}
- +
diff --git a/web_src/vuepages/pages/resources/components/SpecificationDialog.vue b/web_src/vuepages/pages/resources/components/SpecificationDialog.vue index 960ddbf89..ec0732e0b 100644 --- a/web_src/vuepages/pages/resources/components/SpecificationDialog.vue +++ b/web_src/vuepages/pages/resources/components/SpecificationDialog.vue @@ -20,7 +20,7 @@ {{ $t('resourcesManagement.sourceSpecCode') }}
-
diff --git a/web_src/vuepages/pages/resources/scene/index.vue b/web_src/vuepages/pages/resources/scene/index.vue index 5bad15a4e..a42124bab 100644 --- a/web_src/vuepages/pages/resources/scene/index.vue +++ b/web_src/vuepages/pages/resources/scene/index.vue @@ -239,7 +239,7 @@ export default { }, deleteRow(row) { this.$confirm(this.$t('resourcesManagement.resSceneDeleteConfirm'), this.$t('tips'), { - confirmButtonText: this.$t('confirm'), + confirmButtonText: this.$t('confirm1'), cancelButtonText: this.$t('cancel'), type: 'warning', lockScroll: false, diff --git a/web_src/vuepages/pages/resources/specification/index.vue b/web_src/vuepages/pages/resources/specification/index.vue index def63bdb8..1c2b22d30 100644 --- a/web_src/vuepages/pages/resources/specification/index.vue +++ b/web_src/vuepages/pages/resources/specification/index.vue @@ -257,7 +257,7 @@ export default { onShelf(data) { const type = 'on-shelf'; this.$confirm(type === 'on-shelf' ? this.$t('resourcesManagement.onShelfConfirm') : this.$t('resourcesManagement.offShelfConfirm'), this.$t('tips'), { - confirmButtonText: this.$t('confirm'), + confirmButtonText: this.$t('confirm1'), cancelButtonText: this.$t('cancel'), type: 'warning', lockScroll: false, @@ -297,7 +297,7 @@ export default { }, offShelfPrev(data) { this.$confirm(this.$t('resourcesManagement.offShelfConfirm'), this.$t('tips'), { - confirmButtonText: this.$t('confirm'), + confirmButtonText: this.$t('confirm1'), cancelButtonText: this.$t('cancel'), type: 'warning', lockScroll: false,