From f0448340b384b3b56380a518f0d85cb0c205b1cc Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 29 Sep 2021 16:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9webscoket=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=BA=E6=89=8B=E6=9C=BA=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tools/HeaderNotice.vue         | 5 +++--
 src/views/meetingActivity/MeetingActivity.vue | 2 +-
 src/views/system/UserAnnouncementList.vue     | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue
index 8ae6bbb..b1b7522 100644
--- a/src/components/tools/HeaderNotice.vue
+++ b/src/components/tools/HeaderNotice.vue
@@ -180,8 +180,9 @@
 
       initWebSocket: function () {
         // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
-        var userId = store.getters.userInfo.id
-        var url = window._CONFIG['domianWebSocketURL'].replace('https://','wss://').replace('http://','ws://')+'/websocket/'+userId
+        var userPhone = store.getters.userInfo.phone
+        console.log('store.getters.userInfo',store.getters.userInfo)
+        var url = window._CONFIG['domianWebSocketURL'].replace('https://','wss://').replace('http://','ws://')+'/websocket/'+userPhone
         //console.log(url);
         this.websock = new WebSocket(url)
         this.websock.onopen = this.websocketOnopen
diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 9e0dddf..fa98ae1 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -28,7 +28,7 @@
               </a-form-item>
             </a-col>
             <a-col :xxl="7" :xl="10" :md="10" :sm="24">
-              <a-form-item label="提醒时间">
+              <a-form-item label="会议时间">
                 <j-date
                   placeholder="请选择开始日期"
                   class="query-group-cust"
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index 31e3884..022909f 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -162,6 +162,7 @@ export default {
     handleDetail: function (record) {
       this.$refs.sysAnnouncementModal.detail(record)
       this.$refs.sysAnnouncementModal.title = '查看'
+
     },
     showAnnouncement(record) {
       putAction(this.url.editCementSend, {anntId: record.anntId}).then((res) => {