diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue
index 05f502c..fe56589 100644
--- a/src/views/dashboard/Analysis.vue
+++ b/src/views/dashboard/Analysis.vue
@@ -7,7 +7,7 @@
         rowKey="id"
         :columns="columns"
         :scroll="{x: 1000}"
-        :dataSource="dataMessageList"
+        :dataSource="dataSource"
         :pagination="ipagination"
         :loading="loading"
         @change="handleTableChange"
@@ -81,16 +81,15 @@
 import IndexRouter from '@views/dashboard/indexRouter'
 import { getAction, putAction } from '@api/manage'
 import { Bus } from '@comp/tools/Bus'
-import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
-import DynamicNotice from '../../components/tools/DynamicNotice'
+// import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 
 
 export default {
   name: 'Analysis',
   components: {
-    DynamicNotice,
-    ShowAnnouncement
+    // DynamicNotice,
+    // ShowAnnouncement
   },
   mixins: [JeroListMixin],
   data() {
@@ -138,6 +137,8 @@ export default {
     // Bus.$on('header-notice-change', () => {
     //   this.loadData()
     // })
+    this.filters.readFlag = '0'
+    this.loadData(1)
   },
   methods: {
     /*
@@ -149,18 +150,17 @@ export default {
       })
     },
     // loadData
-    loadData() {
-      const param = {
-        readFlag: '0',
-        pageSize: 15
-      }
-      getAction(this.url.list, param).then(res => {
-        this.dataMessageList = []
-        if (res.success) {
-          this.dataMessageList = [...res.result.records]
-        }
-      })
-    },
+    // loadData() {
+    //   const param = {
+    //     readFlag: '0',
+    //   }
+    //   getAction(this.url.list, param).then(res => {
+    //     this.dataMessageList = []
+    //     if (res.success) {
+    //       this.dataMessageList = [...res.result.records]
+    //     }
+    //   })
+    // },
     /*
     * 跳转我的消息
     * */
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 03c748b..3d96b6f 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -22,8 +22,15 @@
             </a-col>
             <a-col :xl="7" :lg="8" :md="8" :sm="24">
               <a-form-item label="会议类型">
-                <j-dict-select-tag dict-code="meeting_type" placeholder="请选择会议类型"
-                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+<!--                <j-dict-select-tag dict-code="meeting_type" placeholder="请选择会议类型"-->
+<!--                                   v-model="queryParam.meetingType"></j-dict-select-tag>-->
+                <a-select
+                  v-model="selectedMeetingType"
+                  placeholder="请选择会议类型"
+                  @change="changeMeetingType"
+                >
+                  <a-select-option v-for="(item,index) of meetingTypeList" :key="index" :value="item.value">{{item.name}}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
             <a-col :xxl="7" :xl="10" :md="10" :sm="24">
@@ -209,7 +216,18 @@ export default {
       // 加载状态
       loading: false,
       // 会议类型
-      meetingType: ''
+      meetingType: '',
+      selectedMeetingType:undefined,
+      meetingTypeList:[
+        {name:'工作组会议',value:'1'},
+        {name:'国际研讨会',value:'3'},
+        {name:'其他会议',value:'4'},
+        {name:'分标委会议',value:'5'},
+        {name:'理事会会议',value:'6'},
+        {name:'信息交流会',value:'7'},
+        {name:'培训会',value:'8'},
+        {name:'宣贯会',value:'9'}
+      ],
     }
   },
   computed: {
@@ -310,6 +328,7 @@ export default {
       this.lastQueryParam = {}
       this.pageNo = 1
       this.pageSize = 10
+      this.selectedMeetingType = undefined
       this.initData(1)
     },
     /*
@@ -335,7 +354,29 @@ export default {
       }
 
 
-    }
+    },
+    /*
+    * 会议状态
+    * */
+    changeMeetingType(val){
+      if(val === '7'){
+        // 信息交流会
+        this.queryParam.meetingType = '2'
+        this.queryParam.tbMeetingType = '3'
+
+      }else if(val ===  '8'){
+        //培训会
+        this.queryParam.meetingType = '2'
+        this.queryParam.tbMeetingType = '2'
+
+      }else if(val === '9' ){
+        // 宣贯会
+        this.queryParam.meetingType = '2'
+        this.queryParam.tbMeetingType = '1'
+      }else {
+        this.queryParam.meetingType = val
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index cd91d8c..9d9f55c 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -160,6 +160,10 @@ export default {
       formData: '',
       // 企业短消息提醒类型
       noticeTypeList: [
+        {
+          name: '项目通知',
+          value: '1'
+        },
         {
           name: '会议通知',
           value: '3'
@@ -180,6 +184,10 @@ export default {
           name: '开票通知',
           value: '10'
         },
+        {
+          name: '缴费通知',
+          value: '11'
+        },
         {
           name:'系统通知',
           value: '12'