导演部增加结束会议按钮

src/api/chat/chatRoom.js

@@ -42,11 +42,6 @@ export const setChatRoomCurrentIssue = (chatRoomId, currentIssue) => {
     return get(`${PREFIX_CHATROOM}/setChatRoomCurrentIssue?chatRoomId=${chatRoomId}&currentIssue=${currentIssue}`);
 }
 
-//设置聊天室（群组）状态
-export const setChatRoomStatus = (chatRoomId) => {
-    return get(`${PREFIX_CHATROOM}/setChatRoomStatus?chatRoomId=${chatRoomId}`);
-}
-
 //上传文件
 export const upLoadFiles = (bucket, data) => {
     return fileUpload(`api/rest/file/upload?bucket=${bucket}`, data)

src/view/ddkz/components/chatRoomMemberDialog.vue

@@ -181,12 +181,12 @@ export default {
                 }
 
                 .cardType1 {
-                    background-image: url(@/assets/img/ddkz/13.png);
+                    background-image: url(@/assets/img/ddkz/14.png);
                     background-size: 100% 100%;
                 }
 
                 .cardType2 {
-                    background-image: url(@/assets/img/ddkz/14.png);
+                    background-image: url(@/assets/img/ddkz/13.png);
                     background-size: 100% 100%;
                 }
             }

src/view/ddkz/components/noticeDialog.vue

@@ -28,7 +28,7 @@
 
 
 <script>
-import { upLoadFiles } from '../../../api/chat/chatRoom';
+import { upLoadFiles, stopExercise } from '../../../api/chat/chatRoom';
 import { format_file } from '../../../util/http_util';
 import elDragDialog from "@/util/directive/el-dragDialog";
 // import { h } from 'vue';
@@ -101,7 +101,13 @@ export default {
             this.dialogVisible = false;
         },
         end() {
-
+            this.myStompClient.send(`/app/sendToChatRoom/${this.currentChatRoom.id}/${this.currentChatRoom.teamId}`, {}, JSON.stringify(this.form));
+            let data = {chatRoomId: this.currentChatRoom.id, result: this.form.content};
+            stopExercise(data).then(res =>{
+                console.log(res);
+            }).catch(err =>{
+                console.log(err);
+            });
         },
         handleDialogOpen() {
             this.myStompClient = this.$props.stompClient;

src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue

@@ -276,7 +276,9 @@ export default {
                 createChatRoom(this.formData).then(res => {
                     if (res == '创建成功') {
                         this.$message.success('聊天室创建成功！');
+                        this.getUserList();
                         this.formData.teams = [];
+                        this.formData.director = []
                     }
                 }).catch(error => {
                     this.$message.error(error);

src/view/sjgl/ddkzConfig/ddkzConfigApprove.vue

@@ -15,7 +15,7 @@
             <el-table :data="meetingList" tooltip-effect="dark" style="width: 100%;" height="calc(100% - 60px)">
                 <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
                 <el-table-column prop="chatRoomInfo.nickname" label="演习标题" align="center"></el-table-column>
-                <el-table-column prop="teamInfo.teamType" label="演习方" align="center"></el-table-column>
+                <el-table-column prop="teamInfo.teamName" label="演习方" align="center"></el-table-column>
                 <el-table-column prop="title" label="发送标题" align="center"></el-table-column>
                 <el-table-column prop="content" label="发送内容" align="center"></el-table-column>
                 <el-table-column prop="remark" label="发送附件" align="center"></el-table-column>
@@ -23,12 +23,12 @@
                 <el-table-column label="操作" align="center" width="500">
                     <template slot-scope="scope">
                         <!-- <el-button size="mini" type="primary">详情</ el-button> -->
-                        <el-button v-if="(scope.row.messageStatus?scope.row.messageStatus.name:null) == '待审批'" size="mini" type="success"
+                        <el-button v-if="(scope.row.messageStatus?scope.row.messageStatus.value:null) == 'PENDING_APPROVAL'" size="mini" type="success"
                             @click="passNotice(scope.row)">同意</el-button>
-                        <el-button v-if="(scope.row.messageStatus?scope.row.messageStatus.name:null) == '待审批'" size="mini" type="danger"
+                        <el-button v-if="(scope.row.messageStatus?scope.row.messageStatus.value:null) == 'PENDING_APPROVAL'" size="mini" type="danger"
                             @click="rejectNotice(scope.row)">驳回</el-button>
-                        <el-tag v-if="(scope.row.messageStatus?scope.row.messageStatus.name:null) == '已同意'" type="success" effect="dark">已通过</el-tag>
-                        <el-tag v-if="(scope.row.messageStatus?scope.row.messageStatus.name:null) == '已拒绝'" type="danger" effect="dark">未通过</el-tag>
+                        <el-tag v-if="(scope.row.messageStatus?scope.row.messageStatus.value:null) == 'PASS'" type="success" effect="dark">已通过</el-tag>
+                        <el-tag v-if="(scope.row.messageStatus?scope.row.messageStatus.value:null) == 'REFUSE'" type="danger" effect="dark">未通过</el-tag>
                     </template>
                 </el-table-column>
             </el-table>