From b63582e5d17cbe227ae312ee63d9406043abbe4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 8 Sep 2023 16:26:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95=20?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=88=87=E6=8D=A2=20ota=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=82=AC=E6=B5=AE=E4=BF=AE=E6=94=B9=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E6=90=9C=E7=B4=A2=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../components/globalAdvancedQuery/index.vue | 10 +++--- jero-web/src/mixins/JeroListMixin.js | 4 +-- .../otaAuthentication/components/detil.vue | 2 +- .../ParameterItemCollectionList.vue | 20 +++++++++++- .../components/certificationList/index.vue | 12 +++---- .../components/listOfRegulations.vue | 32 ++++++++----------- .../src/views/system/modules/RoleModal.vue | 26 +++++++-------- 9 files changed, 63 insertions(+), 47 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 709bdd937..3163d1c67 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1957,4 +1957,6 @@ module.exports = { UserFeedback:'User Feedback', Correspondingversion:'Corresponding version', Listcreationtime:'List creation time', + Chinesecharacters:'The role code cannot enter Chinese characters', + alreadyexistssystem:'The role encoding already exists', } \ 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 368809127..97890c560 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3913,4 +3913,6 @@ module.exports = { UserFeedback:'用户反馈', Correspondingversion:'对应版本', Listcreationtime:'清单创建时间', + Chinesecharacters:'角色编码不可以输入汉字', + alreadyexistssystem:'角色编码已存在', } \ No newline at end of file diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue index f4ec4171e..d67d3003e 100644 --- a/jero-web/src/components/globalAdvancedQuery/index.vue +++ b/jero-web/src/components/globalAdvancedQuery/index.vue @@ -11,15 +11,15 @@ {{$t('empty')}} - + - {{$t('advancedQuery')}} + {{long}}{{$t('advancedQuery')}} - + - {{$t('advancedQuery')}} + {{$t('advancedQuery')}} , diff --git a/jero-web/src/mixins/JeroListMixin.js b/jero-web/src/mixins/JeroListMixin.js index a5ddfabce..7f667e703 100644 --- a/jero-web/src/mixins/JeroListMixin.js +++ b/jero-web/src/mixins/JeroListMixin.js @@ -213,12 +213,12 @@ export const JeroListMixin = { }, handleEdit: function (record) { this.$refs.modalForm.edit(record); - this.$refs.modalForm.title = "编辑"; + this.$refs.modalForm.title = this.$t('edit'); this.$refs.modalForm.disableSubmit = false; }, handleAdd: function () { this.$refs.modalForm.add(); - this.$refs.modalForm.title = "新增"; + this.$refs.modalForm.title = this.$t('newlyAdded'); this.$refs.modalForm.disableSubmit = false; }, handleTableChange(pagination, filters, sorter) { diff --git a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue index 4f2d18ad9..6399ef70c 100644 --- a/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue +++ b/jero-web/src/views/otamanagement/otaAuthentication/components/detil.vue @@ -262,7 +262,7 @@ :label='item.versionName' :key="key" :value="item.projectId"> - + {{ item.versionName }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index e6e1ea4fb..66dffac05 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -141,7 +141,7 @@ - @@ -1084,6 +1084,24 @@ getQueryDutyTerritory() { getAction('/params/collectManifest/queryDutyTerritory', { id: this.$route.query.id }).then((res) => { if (res.success) { + // res.result.push( + // { + // value:'aaa', + // key:'aaa' + // }, + // { + // value:'bbb', + // key:'bbb' + // }, + // { + // value:'ccc', + // key:'ccc' + // }, + // { + // value:'ddd', + // key:'ddd' + // }, + // ) this.dutyTerritoryList = res.result || [] } else { this.dutyTerritoryList = [] diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index e7d0e335f..496f75338 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -81,15 +81,15 @@ - {{$t('reset')}} - {{$t('query')}} - - + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + {{$t('reset')}} + {{$t('query')}} + diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 7e1462d6a..fc315edc7 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -15,15 +15,6 @@ v-model="queryParam.serialNumber"> - - - - - - - - -
@@ -116,17 +107,18 @@ - + - {{$t('reset')}} - {{$t('query')}} - - - {{ !toggleSearchStatus ? $t('open') : $t('away') }} - - + + {{ !toggleSearchStatus ? $t('open') : $t('away') }} + + + {{$t('reset')}} + {{$t('query')}} + + @@ -750,6 +742,7 @@ pageNo: 1, pageSize: 50, total: 0, + long:'', roleSwitchingList: [], formInlineQuestion: {}, formInlineReset: {}, @@ -1540,6 +1533,7 @@ this.queryParam.firstLevelDutyTerritory = this.areaOfResponsibilityList.dutyTerritoryName this.queryParam = { ...this.queryParam } } + this.long = localStorage.getItem('language') || 'zh-cn' this.JLoading = true this.getHeader() this.queryLawEngineerByProjectId() diff --git a/jero-web/src/views/system/modules/RoleModal.vue b/jero-web/src/views/system/modules/RoleModal.vue index 53b9032b1..e5a20277d 100644 --- a/jero-web/src/views/system/modules/RoleModal.vue +++ b/jero-web/src/views/system/modules/RoleModal.vue @@ -16,22 +16,22 @@ - + :label="$t('roleName')"> + - + :label="$t('RoleCode')"> + - + :label="$t('describe')"> + @@ -64,18 +64,18 @@ validatorRules:{ roleName:{ rules: [ - { required: true, message: '请输入角色名称!' }, - { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' } + { required: true, message: this.$t('roleName') + this.$t('cannotEmpty')}, + { min: 0, max: 30, message: this.$t('cantExeed') + '30' + this.$t('characters'), trigger: 'blur' } ]}, roleCode:{ rules: [ - { required: true, message: '请输入角色名称!'}, - { min: 0, max: 64, message: '长度不超过 64 个字符', trigger: 'blur' }, + { required: true, message: this.$t('RoleCode') + this.$t('cannotEmpty')}, + { min: 0, max: 64, message: this.$t('cantExeed') + '64' + this.$t('characters'), trigger: 'blur' }, { validator: this.validateRoleCode} ]}, description:{ rules: [ - { min: 0, max: 126, message: '长度不超过 126 个字符', trigger: 'blur' } + { min: 0, max: 126, message: this.$t('cantExeed') + '126' + this.$t('characters'), trigger: 'blur' } ]} }, } @@ -141,7 +141,7 @@ }, validateRoleCode(rule, value, callback){ if(/[\u4E00-\u9FA5]/g.test(value)){ - callback("角色编码不可输入汉字!"); + callback(this.$t('Chinesecharacters')); }else{ var params = { tableName: "sys_role", @@ -154,7 +154,7 @@ callback(); }else{ if(res.message == '该值不可用，系统中已存在！') { - callback('角色编码已存在！'); + callback(this.$t('alreadyexistssystem')); } } });