diff --git a/src/api/personCenter.js b/src/api/personCenter.js
index bb788a50..03bfd997 100644
--- a/src/api/personCenter.js
+++ b/src/api/personCenter.js
@@ -1,4 +1,4 @@
-import { postAction } from './manage'
+import { getAction, postAction } from './manage'
// 我的收藏-取消收藏
const cancelCollect = (params) => postAction('/personal/lawsStandardCollection/delete', params)
@@ -6,7 +6,11 @@ const cancelCollect = (params) => postAction('/personal/lawsStandardCollection/d
// 浏览记录-清除浏览记录
const clearBrowsingHistory = (params) => postAction('/personal/lawsBrowsingHistory/delete', params)
+// 我的消息-详情
+const getMsgDetail = (params) => getAction('/sys/sysAnnouncementSend/getDetailsById', params)
+
export {
cancelCollect,
- clearBrowsingHistory
+ clearBrowsingHistory,
+ getMsgDetail
}
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index f47a17c9..e8eaa2c8 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -501,13 +501,16 @@ module.exports = {
message: {
// 我的消息
my: {
+ title: 'title',
+ publisher: 'publisher',
+ readingStatus: 'readingStatus',
messageContent: 'Message Content',
messageType: 'Message Type',
- allLabelsRead: 'Mark as Read',
+ allLabelsRead: 'All Mark as Read',
subscriptionNotification: 'Subscription Notification',
warningInformation: 'Warning Information',
forwardPush: 'Forward Push',
- notificationTime: 'Notification Time',
+ notificationTime: 'Release Time',
areAllLabelsRead: 'Are All Mark as Read'
}
},
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index c84afdcc..333253a4 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -458,7 +458,7 @@ module.exports = {
},
// 文档比对
comparison: {
- textNumber:'文本号',
+ textNumber: '文本号',
textName: '文本名称',
oldDocumentTextNumber: '旧文档文本号',
oldDocumentTextName: '旧文档文本名称',
@@ -531,13 +531,16 @@ module.exports = {
message: {
// 我的消息
my: {
+ title: '标题',
+ publisher: '发布人',
+ readingStatus: '阅读状态',
messageContent: '消息内容',
messageType: '消息类型',
- allLabelsRead: '标记已读',
+ allLabelsRead: '全部标记已读',
subscriptionNotification: '订阅通知',
warningInformation: '预警信息',
forwardPush: '转发推送',
- notificationTime: '通知时间',
+ notificationTime: '发布时间',
areAllLabelsRead: '是否全部标记已读'
}
},
diff --git a/src/views/system/UserAnnouncementDetail.vue b/src/views/system/UserAnnouncementDetail.vue
new file mode 100644
index 00000000..9c016faa
--- /dev/null
+++ b/src/views/system/UserAnnouncementDetail.vue
@@ -0,0 +1,35 @@
+
+
+ {{data}}
+
+
+
+
+
+
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 1bb99151..f8fb667f 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -6,84 +6,70 @@
-
-
+
+
-
-
- {{ $t('pleaseSelect') }}
-
-
- {{ msgCategoryQuery[item] }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ $t('query') }}
- {{ $t('reset') }}
-
-
+
+
{{ $t('query') }}
+
{{ $t('reset') }}
+
-
+
+
{{ $t('message.my.allLabelsRead') }}
-
-
-
- {{ $t('batchDelete') }}
-
+
-
-
-
-
- {{ language === 'zh-cn' && scope.msgContentCn ? scope.msgContentCn : scope.msgContent }}
-
-
-
-
-
- {{ msgCategoryQuery[text] }}
-
-
-
-
-
-
-
-
-
+
@@ -93,13 +79,15 @@
// import DynamicNotice from '../../components/tools/DynamicNotice'
import { getAction, deleteAction } from '@/api/manage'
import { JeroListMixin } from '@/mixins/JeroListMixin'
-import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
+// import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import Vue from 'vue'
import { ACCESS_TOKEN } from '@/store/mutation-types'
+import JTable from '@comp/jero/JTable'
export default {
name: 'UserAnnouncementList',
- mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide],
+ components: { JTable },
+ mixins: [JeroListMixin],
// components: {
// DynamicNotice,
// ShowAnnouncement
@@ -132,34 +120,49 @@ export default {
},
columns: [
{
- title: this.$t('message.my.messageContent'),
- align: 'left',
- dataIndex: 'msgContent',
- ellipsis: true,
- width: 450,
- scopedSlots: { customRender: 'msgTitile' }
+ title: this.$t('message.my.title'),
+ align: 'center',
+ dataIndex: 'titile',
+ width: 150,
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('message.my.messageType'),
- align: 'left',
- ellipsis: true,
- dataIndex: 'msgCategory',
+ align: 'center',
+ dataIndex: 'msgCategory_dictText',
width: 150,
- scopedSlots: { customRender: 'msgCategory' }
+ scopedSlots: { customRender: 'text' }
+ },
+ {
+ title: this.$t('message.my.publisher'),
+ align: 'center',
+ dataIndex: 'sender_dictText',
+ width: 150,
+ scopedSlots: { customRender: 'text' }
},
{
title: this.$t('message.my.notificationTime'),
- align: 'left',
- ellipsis: true,
- width: 180,
- dataIndex: 'sendTime'
+ align: 'center',
+ width: 120,
+ dataIndex: 'sendTime',
+ scopedSlots: { customRender: 'text' }
+ },
+ {
+ title: this.$t('message.my.readingStatus'),
+ align: 'center',
+ width: 120,
+ dataIndex: 'readFlag_dictText',
+ scopedSlots: { customRender: 'text' }
+ },
+ {
+ // 操作
+ // fixed: 'right',
+ title: this.$t('operation'),
+ dataIndex: 'action',
+ align: 'center',
+ width: 100,
+ scopedSlots: { customRender: 'action' }
}
- // {
- // title: '',
- // align: 'left',
- // ellipsis: true,
- // width: 50
- // }
],
url: {
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
@@ -177,6 +180,15 @@ export default {
this.language = localStorage.getItem('language') || ''
},
methods: {
+ // 跳转详情
+ handleGoDetail (record) {
+ this.$router.push({
+ path: '/isps/userAnnouncementDetail',
+ query: {
+ id: record.id
+ }
+ })
+ },
expandIcon (props) {
if (props.expanded) {
return {