diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index 0233fec30..52298ebb1 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,9 +15,9 @@

- - {{ language == 'zh-cn'?record.msgContentCn:record.msgContent }} + {{ language == 'zh-cn'&& record.msgContentCn?record.msgContentCn:record.msgContent }}

diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue index fe22a2d10..a41bfc74b 100644 --- a/jero-web/src/views/dashboard/components/myNews.vue +++ b/jero-web/src/views/dashboard/components/myNews.vue @@ -11,8 +11,8 @@
-
- {{language == 'zh-cn'?item.msgContentCn:item.msgContent}} +
+ {{language == 'zh-cn' && item.msgContentCn?item.msgContentCn:item.msgContent}}
{{item.sendTime}} diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index 1d39b7282..2e38e9c4e 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -38,6 +38,9 @@ :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :columns="columns" > + + {{text}} + {{text}} @@ -164,7 +167,7 @@ dataIndex: 'title', ellipsis: true, width: 170, - scopedSlots: { customRender: 'titleName' } + scopedSlots: { customRender: 'serial_number' } }, { title: this.$t('status'), @@ -244,6 +247,15 @@ eventBUs.$off('searchQuery') }, methods: { + standClick(val){ + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: { + id: val.id + } + }) + window.open(newUrl.href, '_blank') + }, callback(tab) { this.selectedRowKeys = [] this.activeTab = tab diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index eb6183d14..019721871 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -73,8 +73,8 @@ - {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}} + :title="language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent"> + {{language == 'zh-cn' && scope.msgContentCn? scope.msgContentCn : scope.msgContent}} @@ -84,7 +84,7 @@

- +