diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 189827cb1..7b67fcac7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -361,5 +361,18 @@ module.exports = { BatchCancel:'Batch cancel collection', SubscriptionManagement:'Subscription domain management', BatchCancellation:'Batch cancellation', - + clickUpload:'Click upload', + viewUploadedFiles:'View uploaded files', + standardSelection:'Standard selection', + Collection:'Collection', + CancelCollection:'Cancel collection', + deleteLib:'delete', + subscribe:'Subscribe', + CancelSubscribe:'Cancel Subscribe', + ConfirmCollection:'Confirm collection ?', + cancelConfirmCollection:'Are you sure you want to cancel the collection', + ConfirmSubscribe:'Confirm Subscribe ?', + cancelConfirmSubscribe:'Are you sure you want to cancel the subscribe', + ConfirmDelete:'Confirm Delete ?', + ConfirmBatchDeletion:'Confirm Batch Deletion ? ', } \ 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 8922f5048..592e35521 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -365,4 +365,18 @@ module.exports = { BatchCancellation:'批量取消', enterMenuEnName:'请输入菜单英文名称', MenuEnName:'菜单英文名称', + clickUpload:'点击上传', + viewUploadedFiles:'查看已上传文件', + standardSelection:'标准选择', + Collection:'收藏', + CancelCollection:'取消收藏', + deleteLib:'删除', + subscribe:'订阅', + CancelSubscribe:'取消订阅', + ConfirmCollection:'确定收藏?', + cancelConfirmCollection:'确定取消收藏?', + ConfirmSubscribe:'确定订阅?', + cancelConfirmSubscribe:'确定取消订阅?', + ConfirmDelete:'确定删除?', + ConfirmBatchDeletion:'确定批量删除?', } \ No newline at end of file diff --git a/jero-web/src/components/Standardselection/index.vue b/jero-web/src/components/Standardselection/index.vue index fbf24fdd7..863e55918 100644 --- a/jero-web/src/components/Standardselection/index.vue +++ b/jero-web/src/components/Standardselection/index.vue @@ -9,11 +9,11 @@ - 标准选择 + {{this.$t('standardSelection')}} {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || - formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件' + formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} diff --git a/jero-web/src/components/dict/JDictSelectTag.vue b/jero-web/src/components/dict/JDictSelectTag.vue index 0c991d188..ebd996ede 100644 --- a/jero-web/src/components/dict/JDictSelectTag.vue +++ b/jero-web/src/components/dict/JDictSelectTag.vue @@ -69,10 +69,10 @@ methods: { initDictData() { //优先从缓存中读取字典配置 - if(getDictItemsFromCache(this.dictCode)){ +/* if(getDictItemsFromCache(this.dictCode)){ this.dictOptions = getDictItemsFromCache(this.dictCode); return - } + }*/ //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { diff --git a/jero-web/src/components/dict/JMultiSelectTag.vue b/jero-web/src/components/dict/JMultiSelectTag.vue index 66f9ba9dd..16d05aec8 100644 --- a/jero-web/src/components/dict/JMultiSelectTag.vue +++ b/jero-web/src/components/dict/JMultiSelectTag.vue @@ -88,11 +88,11 @@ this.dictOptions = [...this.options] }else{ //优先从缓存中读取字典配置 - let cacheOption = getDictItemsFromCache(this.dictCode) - if(cacheOption && cacheOption.length>0){ - this.dictOptions = cacheOption - return - } + // let cacheOption = getDictItemsFromCache(this.dictCode) + // if(cacheOption && cacheOption.length>0){ + // this.dictOptions = cacheOption + // return + // } //根据字典Code, 初始化字典数组 ajaxGetDictItems(this.dictCode, null).then((res) => { if (res.success) { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 777c291e8..068d1bcd9 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -112,7 +112,7 @@ {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' || - formInline[item.db_field_name] == null) ? '点击上传' : '查看已上传文件' + formInline[item.db_field_name] == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -590,7 +590,7 @@ .button-text { height: 38px; - width: calc(100% - 120px); + width: calc(100% - 100px); line-height: 38px; background: #fff; border: 1px #00B3BE solid; diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index 34a68b282..e9bcba633 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -53,7 +53,7 @@ - + {{$t('query')}} {{$t('reset')}} diff --git a/jero-web/src/components/tableDate/index.vue b/jero-web/src/components/tableDate/index.vue index 75953d36a..293cd1f5e 100644 --- a/jero-web/src/components/tableDate/index.vue +++ b/jero-web/src/components/tableDate/index.vue @@ -15,11 +15,11 @@ - - {{!record.collectFlag || record.collectFlag == 0 ? '收藏' :'取消收藏'}} + + {{!record.collectFlag || record.collectFlag == 0 ? $t('Collection') :$t('CancelCollection')}} - - {{!record.subscribeFlag || record.subscribeFlag == 0 ? '订阅' :'取消订阅'}} + + {{!record.subscribeFlag || record.subscribeFlag == 0 ? $t('subscribe') :$t('CancelSubscribe')}} {{ol.text}} diff --git a/jero-web/src/components/uploadFile/file.vue b/jero-web/src/components/uploadFile/file.vue index 5b0d8d09b..2e2f81ab2 100644 --- a/jero-web/src/components/uploadFile/file.vue +++ b/jero-web/src/components/uploadFile/file.vue @@ -14,7 +14,7 @@ :remove='remove' @change="handleChange">

-

点击上传

+

{{this.$t('clickUpload')}}

@@ -29,7 +29,7 @@ data(){ return{ visible:false, - title:'上传文件', + title:this.$t('clickUpload'), uploadAction:window._CONFIG['domianURL']+"/sys/common/upload", myuploadAction:window._CONFIG['domianURL']+this.thisFileUploadUrl, upDataList:[], diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 5cfa8d248..0f502c258 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -90,19 +90,19 @@ return { OperationList: [ { - text: '取消收藏', + text: this.$t('CancelCollection'), ClickEvent: 'Collection' }, { - text: '取消订阅', + text: this.$t('CancelSubscribe'), ClickEvent: 'subscribe' }, { - text: '编辑', + text: this.$t('edit'), ClickEvent: 'editTable' }, { - text: '删除', + text: this.$t('deleteLib'), ClickEvent: 'deleteTable' } ], @@ -146,7 +146,7 @@ let query = { ...this.$refs.searchRef.queryParam, id: this.idList.join(','), - flag:'file' + flag: 'file' } downloadFile('document/bussDocumentLibraryEO/exportZip', '文档库.zip', query, this.Deselect) }, @@ -163,7 +163,7 @@ if (this.idList.length > 0) { let _this = this this.$confirm({ - content: '确认删除?', + content: _this.$t('ConfirmBatchDeletion'), onOk() { deleteAction(_this.url.deleteBatch, { ids: _this.idList.join(',') }).then((res) => { if (res.success) { @@ -198,7 +198,7 @@ deleteTable(val) { let _this = this this.$confirm({ - content: '确认删除?', + content: _this.$t('ConfirmDelete'), onOk() { deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => { if (res.success) { @@ -215,7 +215,7 @@ Collection(val) { let _this = this this.$confirm({ - content: val.collectFlag == 0 || !val.collectFlag ? '确认收藏?' : '确定取消收藏?', + content: val.collectFlag == 0 || !val.collectFlag ? _this.$t('ConfirmCollection') : _this.$t('cancelConfirmCollection'), onOk() { let url = '' if (val.collectFlag == 0 || !val.collectFlag) { @@ -238,7 +238,7 @@ subscribe(val) { let _this = this this.$confirm({ - content: val.subscribeFlag == 0 || !val.subscribeFlag ? '确认订阅?' : '确定取消订阅?', + content: val.subscribeFlag == 0 || !val.subscribeFlag ? _this.$t('ConfirmSubscribe') : _this.$t('cancelConfirmSubscribe'), onOk() { let url = '' if (val.subscribeFlag == 0 || !val.subscribeFlag) { diff --git a/jero-web/src/views/documentManage/library/modules/addForm.vue b/jero-web/src/views/documentManage/library/modules/addForm.vue index 2dfafcea2..3e06a0394 100644 --- a/jero-web/src/views/documentManage/library/modules/addForm.vue +++ b/jero-web/src/views/documentManage/library/modules/addForm.vue @@ -59,14 +59,14 @@ this.visible = false }, add() { - this.title = '新增' + this.title = this.$t('add') this.visible = true this.$nextTick(() => { this.$refs.addFormDataRef.add() }) }, edit(item) { - this.title = '编辑' + this.title = this.$t('edit') this.visible = true this.$nextTick(() => { this.$refs.addFormDataRef.edit(item)