diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java index 85f26e2c4..992260cd6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportManageEOServiceImpl.java @@ -131,7 +131,7 @@ public class LawsMonthlyReportManageEOServiceImpl extends ServiceImpl pageInfo = this.page(page, queryWrapper); return pageInfo; } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index cd452ed81..4fd6b4a18 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -450,12 +450,13 @@ this.$refs.SelectedByRef.getPush() }, detailClick(item,key) { - this.$router.push({ + let newUrl = this.$router.resolve({ path: '/docManage/library/detail', query: { id: item.bussDocumentLibraryId.split(',')[key] - }, + } }) + window.open(newUrl.href, '_blank') }, SelectedByForm(userIds) { let query = { diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 3bc053999..fa979df36 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -18,7 +18,7 @@ diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 6aac8943e..93b643d1c 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -88,7 +88,7 @@ }, { title: this.$t('title'), - value: 'title' + value: localStorage.getItem('language') && localStorage.getItem('language') == 'zh-cn'?'title':'title_en' }, { title: this.$t('regulatoryEngineer'), diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index a49f48aa3..def7df273 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -72,7 +72,7 @@ }, { title: this.$t('title'), - value: 'title' + value: localStorage.getItem('language') && localStorage.getItem('language') == 'zh-cn'?'title':'title_en' }, { title: this.$t('regulatoryEngineer'), diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue index ea45dc0b4..cc0fad2d1 100644 --- a/jero-web/src/views/projectManagement/components/listEditModel.vue +++ b/jero-web/src/views/projectManagement/components/listEditModel.vue @@ -18,7 +18,7 @@ diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index 019721871..c05737509 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -7,7 +7,7 @@
- {{this.$t('MessageContent')}} + {{ this.$t('MessageContent') }}
- {{this.$t('MessageType')}} + {{ this.$t('MessageType') }}
- {{$t('pleaseSelect')}} + {{ $t('pleaseSelect') }} - {{ msgCategoryQuery[item]}} + {{ msgCategoryQuery[item] }} @@ -35,8 +35,9 @@ - {{$t('query')}} - {{$t('reset')}} + {{ $t('query') }} + {{ $t('reset') }} @@ -46,12 +47,12 @@
- - {{$t('AllLabelsRead')}} + + {{ $t('AllLabelsRead') }}
- - {{$t('BatchDelete')}} + + {{ $t('BatchDelete') }}
@@ -63,7 +64,7 @@ :dataSource="dataSource" :scroll="{x: '100%'}" :pagination="ipagination" - :expandIconAsCell='false' + :expandIconAsCell="false" :expandIconColumnIndex="5" :expandIcon="expandIcon" :expandRowByClick="true" @@ -74,13 +75,13 @@ - {{language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent}} + {{ language == 'zh-cn' && scope.msgContentCn ? scope.msgContentCn : scope.msgContent }} - {{msgCategoryQuery[text]}} + {{ msgCategoryQuery[text] }}

@@ -89,300 +90,348 @@

- + \ No newline at end of file