diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js index 1cf9f421..3212dc6c 100644 --- a/src/common/lang/en-us.js +++ b/src/common/lang/en-us.js @@ -438,6 +438,25 @@ module.exports = { fileUploaded: 'File uploaded, please wait' } }, + // 消息中心 + message: { + // 文档动态 + docDynamics: { + messageContent: 'Message Content', + notificationTime: 'Notification Time' + }, + // 我的消息 + my: { + messageContent: 'Message Content', + messageType: 'Message Type', + allLabelsRead: 'Mark as Read', + subscriptionNotification: 'Subscription Notification', + warningInformation: 'Warning Information', + forwardPush: 'Forward Push', + notificationTime: 'Notification Time', + areAllLabelsRead: 'Are All Mark as Read' + } + }, // 标准选择器 standardSelect: { standardSelection: 'Standard Selection' diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js index 6a67edbd..7d340b93 100644 --- a/src/common/lang/zh-cn.js +++ b/src/common/lang/zh-cn.js @@ -438,6 +438,25 @@ module.exports = { fileUploaded: '文件上传中,请稍后' } }, + // 消息中心 + message: { + // 文档动态 + docDynamics: { + messageContent: '消息内容', + notificationTime: '通知时间' + }, + // 我的消息 + my: { + messageContent: '消息内容', + messageType: '消息类型', + allLabelsRead: '标记已读', + subscriptionNotification: '订阅通知', + warningInformation: '预警信息', + forwardPush: '转发推送', + notificationTime: '通知时间', + areAllLabelsRead: '是否全部标记已读' + } + }, // 标准选择器 standardSelect: { standardSelection: '标准选择' diff --git a/src/views/documentTool/DocumentComparison.vue b/src/views/documentTool/DocumentComparison.vue index d51fb154..53822050 100644 --- a/src/views/documentTool/DocumentComparison.vue +++ b/src/views/documentTool/DocumentComparison.vue @@ -394,5 +394,5 @@ export default { diff --git a/src/views/modules/message/DocumentDynamics.vue b/src/views/modules/message/DocumentDynamics.vue new file mode 100644 index 00000000..afa6682e --- /dev/null +++ b/src/views/modules/message/DocumentDynamics.vue @@ -0,0 +1,122 @@ + + + + + diff --git a/src/views/modules/message/MessageDetails.vue b/src/views/modules/message/MessageDetails.vue new file mode 100644 index 00000000..5c1abef8 --- /dev/null +++ b/src/views/modules/message/MessageDetails.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index ed8c677e..5a9c574e 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -6,20 +6,30 @@ - - + + - - + + + {{ $t('pleaseSelect') }} + + + {{ msgCategoryQuery[item] }} + + + - 查询 - 重置 + {{ $t('query') }} + {{ $t('reset') }} @@ -28,165 +38,264 @@
- 全部标注已读 +
+ + {{ $t('message.my.allLabelsRead') }} +
+
+ + {{ $t('batchDelete') }} +
- - 查看 + + + + {{ language === 'zh-cn' && scope.msgContentCn ? scope.msgContentCn : scope.msgContent }} + + + + + {{ msgCategoryQuery[text] }} + + +

+ + +

- - + + -