Commit b059a92e authored by 以墨为白's avatar 以墨为白 🎧

关闭的会议感叹号提醒

parent f390dca3
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
</div> </div>
</template> </template>
<template v-else-if="item.fromUserId == userInfo.account"> <template v-else-if="item.fromUserId == userInfo.account">
<span v-if="item.messageType == 'CLOSED'" class="el-icon-warning"
style="color: red;font-size: x-large;"></span>
<div class="mySides-text" v-if="item.messageForm == 'TEXT'" v-html="item.content" <div class="mySides-text" v-if="item.messageForm == 'TEXT'" v-html="item.content"
style="background-color: #85ce61;"> style="background-color: #85ce61;">
</div> </div>
...@@ -149,6 +151,9 @@ export default { ...@@ -149,6 +151,9 @@ export default {
this.$refs.chatContent.scrollTop = this.$refs.chatContent.scrollHeight; this.$refs.chatContent.scrollTop = this.$refs.chatContent.scrollHeight;
}, },
subscribe(item) { subscribe(item) {
if (!item.teamAddress) {//关闭的会议理论上不再订阅
return;
}
//取消群聊的订阅 //取消群聊的订阅
for (const sub in this.stompClient.subscriptions) { for (const sub in this.stompClient.subscriptions) {
if (sub.startsWith("multicastTeam")) { if (sub.startsWith("multicastTeam")) {
...@@ -156,10 +161,15 @@ export default { ...@@ -156,10 +161,15 @@ export default {
} }
} }
this.stompClient.subscribe(item.teamAddress, data => { this.stompClient.subscribe(item.teamAddress, data => {
let message = JSON.parse(data.body);
if (data.headers.messageType == "CLOSED" && data.headers.fromUserId != this.userInfo.account) {
return;//已经关闭的会议室当自己收到消息时候需要感叹号提醒
}
this.chatMessageList.push({ this.chatMessageList.push({
content: JSON.parse(data.body).content, content: message.content,
fromUserId: data.headers.fromUserId, fromUserId: data.headers.fromUserId,
messageForm: JSON.parse(data.body).messageForm messageForm: message.messageForm,
messageType: data.headers.messageType
}); });
this.$nextTick(() => { this.$nextTick(() => {
this.keepBottom(); this.keepBottom();
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<el-button size="mini" type="info" @click="showPeopleList">人员列表</el-button> <el-button size="mini" type="info" @click="showPeopleList">人员列表</el-button>
</div> </div>
<div> <div>
<el-button size="mini" type="info" @click="showChatRoom" v-if="currentChatRoomInfo.status.value=='ONGOING'">聊天室</el-button> <el-button size="mini" type="info" @click="showChatRoom">聊天室</el-button>
</div> </div>
<div> <div>
<el-button size="mini" type="info" @click="sendNotice" v-if="currentChatRoomInfo.status.value=='ONGOING'">发送公告</el-button> <el-button size="mini" type="info" @click="sendNotice" v-if="currentChatRoomInfo.status.value=='ONGOING'">发送公告</el-button>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</el-form-item> </el-form-item>
<el-form-item label="演习主持人"> <el-form-item label="演习主持人">
<!-- <el-input v-model="formData.chatroomOwner"></el-input> --> <!-- <el-input v-model="formData.chatroomOwner"></el-input> -->
<el-select v-model="formData.director" multiple placeholder="请选择"> <el-select v-model="formData.director" multiple placeholder="请选择" filterable>
<el-option v-for="item in allData" :key="item.account" :label="item.account" :value="item.account"> <el-option v-for="item in allData" :key="item.account" :label="item.account" :value="item.account">
</el-option> </el-option>
</el-select> </el-select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment