diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index e3ea56c27..0233fec30 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -15,7 +15,10 @@

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

@@ -50,6 +53,7 @@ data() { return { loadding: false, + language: '', url: { listCementByUser: '/sys/sysAnnouncementSend/getMessageUnreadList', editCementSend: '/sys/sysAnnouncementSend/editByAnntIdAndUserId', @@ -91,6 +95,7 @@ }, created() { this.loadData() + this.language = localStorage.getItem('language') || '' // this.initWebSocket() if (store.getters.userInfo) { this.$socketPublic.dispatch('webSocketInit')//初始化ws @@ -139,7 +144,11 @@ showAnnouncement(record) { getAction(this.url.readAllMsg, { ids: record.id }).then((res) => { }) - localStorage.setItem('msgContent', record.msgContent) + if (this.language == 'zh-cn') { + localStorage.setItem('msgContent', record.msgContentCn) + } else { + localStorage.setItem('msgContent', record.msgContent) + } this.$router.push({ path: '/isps/userAnnouncement', query: { diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue index 719748291..3d693062a 100644 --- a/jero-web/src/views/dashboard/components/myNews.vue +++ b/jero-web/src/views/dashboard/components/myNews.vue @@ -11,8 +11,8 @@
-
- {{item.msgContent}} +
+ {{language == 'zh-cn'?item.msgContentCn:item.msgContent}}
{{item.sendTime}} @@ -44,11 +44,13 @@ loading: false, pageNo: 1, pageSize: 4, - dataSource: [] + dataSource: [], + language: '' } }, mounted() { this.getList() + this.language = localStorage.getItem('language') || '' }, methods: { getList() { @@ -69,7 +71,11 @@ magClick(row) { getAction(this.url.readAllMsg, { ids: row.id }).then((res) => { }) - localStorage.setItem('msgContent', row.msgContent) + if (this.language == 'zh-cn'){ + localStorage.setItem('msgContent', row.msgContentCn) + }else{ + localStorage.setItem('msgContent', row.msgContent) + } this.$router.push({ path: '/isps/userAnnouncement', query: { diff --git a/jero-web/src/views/system/UserAnnouncementList.vue b/jero-web/src/views/system/UserAnnouncementList.vue index fbb96c3d5..1c0262c0b 100644 --- a/jero-web/src/views/system/UserAnnouncementList.vue +++ b/jero-web/src/views/system/UserAnnouncementList.vue @@ -71,8 +71,9 @@ @change="handleTableChange"> - - {{text}} + + {{language == 'zh-cn' ? scope.msgContentCn : scope.msgContent}} @@ -82,7 +83,7 @@

- +

@@ -163,10 +164,10 @@ dataIndex: 'sendTime' }, { - title:'', + title: '', align: 'left', ellipsis: true, - width: 50, + width: 50 } ], url: { @@ -177,7 +178,8 @@ }, loading: false, openPath: '', - formData: '' + formData: '', + language: '' } }, watch: { @@ -186,16 +188,25 @@ this.loadData() } }, + mounted() { + this.language = localStorage.getItem('language') || '' + }, methods: { expandIcon(props) { if (props.expanded) { - return { - props.onExpand(props.record, e); - }}/>; + return + { + props.onExpand(props.record, e) + } + } + />; } else { - return { - props.onExpand(props.record, e); - }}/>; + return + { + props.onExpand(props.record, e) + } + } + />; } }, getQueryParams() { @@ -359,8 +370,9 @@ height: 38px; /*margin-top: 2px;*/ } - ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon{ - margin-right: 0; + + ::v-deep .ant-table .ant-table-row-indent + .ant-table-row-expand-icon { + margin-right: 0; }