From d49c133db435db768ee4017ee7a850112514ecc0 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Sun, 26 Sep 2021 09:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/LogList.vue              | 14 --------------
 src/views/system/UserAnnouncementList.vue | 12 +++++++-----
 2 files changed, 7 insertions(+), 19 deletions(-)

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 @@
                <j-date
                  placeholder="请选择开始日期"
                  class="query-group-cust"
-                 v-model="queryParam.meetingStartTime"
+                 v-model="queryParam.startTime"
                  :disabled-date="disabledStartDate">
                </j-date>
                <span class="query-group-split-cust"></span>
                <j-date
                  placeholder="请选择结束日期"
                  class="query-group-cust"
-                 v-model="queryParam.meetingEndTime"
+                 v-model="queryParam.endTime"
                  :disabled-date="disabledEndDate">
                </j-date>
              </a-form-item>
@@ -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({