diff --git a/src/views/system/LogList.vue b/src/views/system/LogList.vue index 30d5703..4e0a8dd 100644 --- a/src/views/system/LogList.vue +++ b/src/views/system/LogList.vue @@ -154,20 +154,6 @@ export default { // align:'center', // sorter: true // }, - { - title: '日志类型', - dataIndex: 'logType_dictText', - /*customRender:function (text) { - if(text==1){ - return "登录日志"; - }else if(text==2){ - return "操作日志"; - }else{ - return text; - } - },*/ - align: 'center' - } ], operateColumn: { diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue index 75c0ce1..949981a 100644 --- a/src/views/system/UserAnnouncementList.vue +++ b/src/views/system/UserAnnouncementList.vue @@ -18,14 +18,14 @@ @@ -151,8 +151,8 @@ export default { readAllMsg: 'sys/sysAnnouncementSend/readAll', }, dateKeyObj: { - beginKey: 'meetingStartTime', - endKey: 'meetingEndTime' + beginKey: 'startTime', + endKey: 'endTime' }, loading: false, openPath: '', @@ -171,12 +171,14 @@ export default { this.syncHeadNotic(record.anntId) } }) + const param = JSON.parse(record.busId) if (record.openType === 'component') { this.openPath = record.openPage // 将参数传入 - this.formData = {id: record.busId} + this.formData = param this.$refs.showDynamNotice.detail() } else if(record.openType === 'url') { + console.log(JSON.parse(record.busId)) const param = {id: record.busId} // 如果是url 跳转页面 this.$router.push({