From 36b44c57a967c55db297f8e31d7e97e4f3b7d6f2 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Tue, 21 Jun 2022 16:08:30 +0800 Subject: [PATCH] [update] --- jero-web/src/common/lang/en-us.js | 7 +++ jero-web/src/common/lang/zh-cn.js | 7 +++ .../parameterlist/components/addModel.vue | 49 ++++++++++--------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 9e848365e..f8ac2da66 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -74,6 +74,7 @@ module.exports = { user: 'User', numericalValue: 'Numerical Value', not: 'No.', + notOnlyRz: 'no', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Search', NoQueriesSaved: 'No Queries Were Saved', @@ -712,6 +713,12 @@ module.exports = { uploadTime: 'Upload Time', enclosure: 'Enclosure', // 认证 + // 认证状态 + Dropdownradio: 'Drop down radio', + 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', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 22d4e84d4..b95f2e589 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -76,6 +76,7 @@ module.exports = { numericalValue: '数值', yes: '是', not: '否', + notOnlyRz: '否', EnterValue: '请输入值', SavedQuery: '保存的查询', NoQueriesSaved: '没有保存任何查询', @@ -723,6 +724,12 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + // 认证状态 + Dropdownradio: '下拉单选', + Dropdownmultipleselection: '下拉多选', + a: '+', + positiveInteger: '正整数', + ParameteItemCollectionList: '参数项收集清单', Areyousureparameteritems: '确认提交所选参数项嘛?', Theselectedconfiguration: '参数清单中参数项均为 待发起收集或变更时，才能添加配置', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 92b1aa041..75567f562 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -37,7 +37,7 @@ {{$t('yes')}} - {{$t('not')}} + {{$t('notOnlyRz')}} @@ -320,27 +320,27 @@ export default { data() { return { controlType: [ // 控件类型 - {value:'1', label: '文本' }, - {value:'2', label: '下拉单选' }, - {value:'3', label: '下拉多选' }, - {value:'4', label: '附件' }, - {value:'5', label: '文本+下拉单选' }, - {value:'6', label: '文本+下拉多选' }, - {value:'7', label: '文本+附件' }, - {value:'8', label: '下拉单选+附件' }, - {value:'9', label: '下拉多选+附件' }, - {value:'10', label: '文本+下拉单选+附件' }, + {value:'1', label: this.$t('text') }, + {value:'2', label: this.$t('Dropdownradio') }, + {value:'3', label: this.$t('Dropdownmultipleselection') }, + {value:'4', label: this.$t('enclosure') }, + {value:'5', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio') }, + {value:'6', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownmultipleselection') }, + {value:'7', label: this.$t('text')+ this.$t('a')+this.$t('enclosure') }, + {value:'8', label: this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, + {value:'9', label: this.$t('Dropdownmultipleselection')+ this.$t('a')+this.$t('enclosure') }, + {value:'10', label: this.$t('text')+ this.$t('a')+this.$t('Dropdownradio')+ this.$t('a')+this.$t('enclosure') }, ], controlVerification: [ // 控件校验 - {value:'1', label: '无' }, - {value:'2', label: '中文' }, - {value:'3', label: '正整数' }, - {value:'4', label: '正浮点数' }, - {value:'5', label: '整数或小数' }, - {value:'6', label: '一位小数' }, - {value:'7', label: '两位小数' }, - {value:'8', label: '三位小数' }, - {value:'9', label: '四位小数' }, + {value:'1', label: this.$t('nothing') }, + {value:'2', label: this.$t('chinese') }, + {value:'3', label: this.$t('positiveInteger') }, + {value:'4', label: this.$t('Positivefloatingpointnumber') }, + {value:'5', label: this.$t('integerOrDecimal')}, + {value:'6', label: this.$t('OneDecimalPlace') }, + {value:'7', label: this.$t('TwoDecimalplaces') }, + {value:'8', label: this.$t('Threedecimalplaces') }, + {value:'9', label: this.$t('FourDecimalplaces') }, ], CategoryTreeList: [], // 技术领域 certCategoryParamsInfoEOList: [], // 认证类别得tab栏 @@ -405,6 +405,7 @@ export default { inputChangelabel: false, // 控件备选值校验 buttonChangelabel: false, // 模板校验 contentListStart: [], // 认证类别编辑 + flag: 1, // 判断师新增，编辑 默认新增 } }, mounted() { @@ -453,7 +454,7 @@ export default { }, Onchangelabel(val) { let _tt = [] - if(this.title == '新增') { + if(this.flag == 1) { this.contentListStart.forEach((itemVal) => { val.forEach((item) => { if(itemVal.value === item.value) { @@ -511,7 +512,8 @@ export default { }, addModel() { this.visible = true - this.title = '新增' + this.flag = 1 + this.title = this.$t('newlyAdded') this.formInline = {} // 获取认证类别 this.getcontentListedEdit() @@ -533,7 +535,8 @@ export default { value.technologyTerritory = value.technologyTerritory.split(',') } this.formInline = value - this.title = '编辑' + this.title = this.$t('edit') + this.flag = 0 // 获取认证类别 this.getcontentListedEdit() value.certCategoryParamsInfoEOList.map((item, index) => {