聊天背景色

src/view/ddkz/components/chatRoomDialog.vue

@@ -148,7 +148,7 @@ export default {
         keepBottom() {
             this.$refs.chatContent.scrollTop = this.$refs.chatContent.scrollHeight;
         },
-        listChatroom(item) {
+        subscribe(item) {
             //取消群聊的订阅
             for (const sub in this.stompClient.subscriptions) {
                 if (sub.startsWith("multicastTeam")) {
@@ -178,10 +178,10 @@ export default {
         handleDialogOpen() {
             // this.analogDataList = this.$props.analogData;
             this.currentChatRoom = this.$props.currentChatRoomInfo;
-            this.title = this.currentChatRoom.teamInfo.teamName;
+            this.title = this.currentChatRoom.teamInfo.teamName + "的聊天室";
             this.myStompClient = this.$props.stompClient;
             //订阅
-            this.listChatroom(this.currentChatRoom);
+            this.subscribe(this.currentChatRoom);
             this.getCurrentMessageList(this.$props.currentChatRoomInfo);
         },
         // 监听输入框内容

src/view/ddkz/components/chatRoomInfo.vue

@@ -36,13 +36,16 @@
                     <div class="everyDayNew">
                         <div class="everyTemplate">
                             <div v-for="(item1, index1) in item.news"
-                                :class="['everyDayNewCard', 'cardType' + item1.teamInfo.teamType]">
+                                :class="['everyDayNewCard', 'cardType' + item1.teamInfo.id % 3]">
                                 <div class="everyDayNewCardTitle" v-text="item1.title"></div>
                                 <div class="everyDayNewCardContent">
                                     <div class="left-everyDayNew" :style="{ width: item1.attachment ? '50%' : '100%' }">
                                         <div class="everyDayNewCardInfo">
                                             <span v-text="item1.time"></span>&emsp;
-                                            来源：<span class="newsSource" v-text="item1.from"></span>
+                                        </div>
+                                        <div class="everyDayNewCardInfo">
+                                            来自于组：<span class="newsSource" v-text="item1.teamInfo.teamName"></span>，
+                                            成员：<span class="newsSource" v-text="item1.from"></span>
                                         </div>
                                         <div class="everyDayNewCardText" v-text="item1.content"></div>
                                     </div>
@@ -134,7 +137,7 @@ export default {
         goBackFn() {
             this.$router.push({ name: '导调控制模块' });
         },
-        listChatroom(item) {
+        subscribe(item) {
             //取消大群聊的订阅和导演部的订阅
             for (const sub in this.stompClient.subscriptions) {
                 if (sub.startsWith("multicastMeeting") || sub.startsWith("multicastApproveNotice")) {
@@ -336,7 +339,7 @@ export default {
         this.currentChatRoomInfo = this.$route.params.data;
         this.stompClient = this.$route.params.client;
         // this.status = this.stompClient.connected;
-        this.listChatroom(this.currentChatRoomInfo);
+        this.subscribe(this.currentChatRoomInfo);
         //获取当前组成员
         // this.getCurrentTeamPeople(this.currentChatRoomInfo);
         //获取当前公告列表
@@ -531,17 +534,17 @@ export default {
 
                     }
 
-                    .cardTypeDIRECTOR {
+                    .cardType0 {
                         background-image: url(@/assets/img/ddkz/new3.png);
                         background-size: 100% 100%;
                     }
 
-                    .cardTypeBLUE {
+                    .cardType1 {
                         background-image: url(@/assets/img/ddkz/new1.png);
                         background-size: 100% 100%;
                     }
 
-                    .cardTypeRED {
+                    .cardType2 {
                         background-image: url(@/assets/img/ddkz/new2.png);
                         background-size: 100% 100%;
                     }

src/view/ddkz/components/chatRoomPeople.vue

 <template>
-    <el-dialog v-el-drag-dialog title="人员情况" :visible.sync="dialogVisible" width="40%" :before-close="handleClose"
+    <el-dialog v-el-drag-dialog title="成员列表" :visible.sync="dialogVisible" width="40%" :before-close="handleClose"
         @open="handleDialogOpen">
         <div class="info-personInfo">
             <div class="personInfo-content">
@@ -114,7 +114,7 @@ export default {
             .teamInfo {
                 width: 100%;
                 height: 30px;
-                text-align: center;
+                // text-align: center;
 
                 &>span {
                     margin-left: 20px;

src/view/ddkz/components/noticeDialog.vue

 <template>
-    <el-dialog v-el-drag-dialog title="发送公告" :visible.sync="dialogVisible" width="30%" :before-close="handleClose"
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose"
         @open="handleDialogOpen">
         <div class="notice">
             <el-form ref="form" :model="form" label-width="80px">
@@ -39,13 +39,14 @@ export default {
                 title: '',
                 content: '',
                 attachment: '',
-                remark:'',
+                remark: '',
                 messageForm: null
             },
             formatFile: format_file(),
             myStompClient: null,
             currentChatRoom: {},
             analogDataList: [],
+            title: "发送公告"
         }
     },
     directives: {
@@ -84,8 +85,11 @@ export default {
             this.form.fileList = [];
         },
         sendNotice() {
-            // this.myStompClient.send(`/app/sendToChatRoom/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
-            this.myStompClient.send(`/app/sendToApprovalPending/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
+            if (this.currentChatRoom.teamInfo.teamType == "DIRECTOR") {
+                this.myStompClient.send(`/app/sendToChatRoom/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
+            } else {
+                this.myStompClient.send(`/app/sendToApprovalPending/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
+            }
             this.form = {
                 title: '',
                 content: '',
@@ -98,6 +102,7 @@ export default {
         handleDialogOpen() {
             this.myStompClient = this.$props.stompClient;
             this.currentChatRoom = this.$props.currentChatRoomInfo;
+            this.title = this.currentChatRoom.teamInfo.teamName + "正在发送公告";
         }
     }
 }