From 60a25bf28aebd3743330990e4d4f6864d5cd15a2 Mon Sep 17 00:00:00 2001 From: zer0Black Date: Wed, 29 Jun 2022 12:55:25 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=AF=BC=E5=87=BA=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E5=88=87=E6=8D=A2=E4=B8=BA=E4=B8=AD=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E5=8F=AF=E5=88=87=E6=8D=A2=E7=9A=84=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 7 +++++-- jero-web/src/common/lang/zh-cn.js | 5 ++++- jero-web/src/views/parameter/parameterlist/index.vue | 12 ++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 789c9ffa4..6f5301ea1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -724,7 +724,7 @@ module.exports = { Dropdownmultipleselection: 'Drop down multiple selection', a: '+', positiveInteger: 'Positive integer', - + // 参数收集开始 ParameteItemCollectionList: 'Parameter item collection list', Areyousureparameteritems: 'Are you sure to submit the selected parameter items?', Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed', @@ -787,6 +787,9 @@ module.exports = { releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', contentDescription: 'Content Description', + parameterTemplateExportName: 'Parameter List', + parameterDataExport: 'Parameter Export Data', + // 参数收集结束 circulationInformation: 'Circulation information', circulationHistory: 'Circulation History', agree: 'Agree', @@ -1054,5 +1057,5 @@ module.exports = { Copyparameterlist: 'Copy parameter list', Templatenamelist: 'Template name - parameter item collection list', newNiONumber: 'Number', - English: 'English' + English: 'English', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index d400195ba..806725d92 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -735,7 +735,7 @@ module.exports = { Dropdownmultipleselection: '下拉多选', a: '+', positiveInteger: '正整数', - + // 参数收集 ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为待发起收集或变更时,才能添加配置', @@ -798,6 +798,9 @@ module.exports = { releaseVersion: '发布版本', parameterTemplate: '参数模板', contentDescription: '内容说明', + parameterTemplateExportName: '参数项列表', + parameterDataExport: '参数项导出数据', + // 参数收集结束 circulationInformation: '流转信息', circulationHistory: '流转历史', agree: '同意', diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index ae4fa00b8..c20d72b9e 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -221,7 +221,7 @@ export default { } let _xx = JSON.stringify(_tt) let _yy = { paramsInfoVO : _xx, exportName: '参数项列表' } - downloadFile('params/paramsInfo/exportParamsInfoZip', '参数项导出数据.zip', { paramsInfoVO : _xx, exportName: '参数项列表' } , this.Deselect) + downloadFile('params/paramsInfo/exportParamsInfoZip', this.$t('parameterDataExport') + '.zip', { paramsInfoVO : _xx, exportName: '参数项列表' } , this.Deselect) }, // 发布版本 releaseVersion() { @@ -235,7 +235,15 @@ export default { }, //下载模板 handleModule() { - downloadFile('params/paramsInfo/exportTemplate', '参数项列表.xlsx', {}) + // let lang = localStorage.getItem('language') || 'zh-cn'; + // if (lang == 'en-us') { + downloadFile('params/paramsInfo/exportTemplate', this.$t('parameterTemplateExportName') + '.xlsx', {}) + // } else if (langCn == 'zh-cn') { + // downloadFile('params/paramsInfo/exportTemplate', 'Parameter list.xlsx', {}) + // } + + + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus