1

src/api/chat/chatRoom.js

@@ -13,8 +13,8 @@ export const createChatRoom = data => {
 }
 
 //查询某个聊天室（群组）详情信息
-export const getChatRoomMemberInfo = (id, userId) => {
-    return get(`${PREFIX_CHATROOM}/memberInfo?id=${id}&userId=${userId}`);
+export const getChatRoomMemberInfo = (id) => {
+    return get(`${PREFIX_CHATROOM}/memberInfo?id=${id}`);
 }
 
 //加入聊天室（群组）

src/view/ddkz/components/chatRoomInfo.vue

@@ -93,7 +93,7 @@
         <NoticeDialog ref="myNotice" :stompClient="stompClient" :currentChatRoomInfo="currentChatRoomInfo"></NoticeDialog>
         <ChatRoomDialog ref="myChatRoom" :currentChatRoomInfo="currentChatRoomInfo" :stompClient="stompClient">
         </ChatRoomDialog>
-        <chatRoomMemberDialog ref="mychatRoomMemberDialog" :currentTeamInfo="currentChatRoomInfo"></chatRoomMemberDialog>
+        <chatRoomMemberDialog ref="mychatRoomMemberDialog" :currentChatRoomInfo="currentChatRoomInfo"></chatRoomMemberDialog>
     </div>
 </template>
 

src/view/ddkz/components/chatRoomMemberDialog.vue

 <template>
-    <el-dialog v-el-drag-dialog title="成员列表" :visible.sync="dialogVisible" width="40%" :before-close="handleClose"
+    <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogVisible" width="40%" :before-close="handleClose"
         @open="handleDialogOpen">
         <div class="info-personInfo">
             <div class="personInfo-content">
@@ -31,14 +31,14 @@ export default {
         return {
             dialogVisible: false,
             personList: [],
-            teamInfo: {}
+            chatRoomInfo: {}
         }
     },
     directives: {
         elDragDialog
     },
     props: {
-        currentTeamInfo: Object
+        currentChatRoomInfo: Object
     },
     methods: {
         handleClose() {
@@ -48,12 +48,12 @@ export default {
             this.dialogVisible = true;
         },
         handleDialogOpen() {
-            this.teamInfo = this.$props.currentTeamInfo;
-            this.getCurrentTeamPeople(this.teamInfo);
+            this.chatRoomInfo = this.$props.currentChatRoomInfo;
+            this.getCurrentTeamPeople(this.chatRoomInfo.id);
         },
-        getCurrentTeamPeople(item) {
+        getCurrentTeamPeople(chatRoomId) {
             //查询聊天组的人员
-            getChatRoomMemberInfo(item.id, this.userInfo.account).then(res => {
+            getChatRoomMemberInfo(chatRoomId).then(res => {
                 this.personList = res;
             }).catch(error => {
                 this.$message.error(error);
@@ -61,12 +61,15 @@ export default {
         },
     },
     computed: {
-        userInfo() {
-            if (this.$store.getters.userInfo) {
-                return this.$store.getters.userInfo;
-            } else {
-                return { account: "" };
-            }
+        // userInfo() {
+        //     if (this.$store.getters.userInfo) {
+        //         return this.$store.getters.userInfo;
+        //     } else {
+        //         return { account: "" };
+        //     }
+        // },
+        title() {
+            return this.chatRoomInfo.nickname + " 成员信息";
         }
     }
 }

src/view/home.vue

@@ -483,7 +483,7 @@ export default {
         }
 
         .top-nav3 {
-            width: 100px;
+            width: 111px;
             height: 40px;
             padding-left: 1%;
             position: absolute;

src/view/sjgl/ddkzConfig/ddkzConfigAdd.vue

@@ -21,6 +21,7 @@
                 <el-form class="yhf" v-for="(item, index) in formData.teams" :key="index">
                     <el-form-item label="队伍名称">
                         <el-input v-model="item.teamName"></el-input>
+                        <span class="myIcon el-icon-remove-outline" @click="removeTeam(index)"></span>
                     </el-form-item>
                     <!-- <el-form-item label="参会立场"> -->
                     <!-- <el-input v-model="formData.teamType"></el-input> -->
@@ -303,7 +304,15 @@ export default {
             } else {
                 this.$message.warning('导演部不能为空！');
             }
-        }
+        },
+        removeTeam(index) {
+            if (this.formData.teams.length > 1) {
+                this.allData = this.allData.concat(this.formData.teams[index].wpinfo);
+                this.formData.teams.splice(index, 1)
+            } else {
+                this.$message.warning('最后一组，不能移除！');
+            }
+        },
     },
     computed: {
         userInfo() {
@@ -367,6 +376,14 @@ export default {
         box-sizing: border-box;
         border-radius: 4px;
 
+        .myIcon {
+            float: right;
+            color: red;
+            font-size: 20px;
+            margin-top: 8px;
+            cursor: pointer;
+        }
+
         &>div:first-child {
             margin-top: 10px;
             display: flex;
@@ -495,5 +512,7 @@ export default {
     .el-form-item__label {
         color: white;
     }
+
+    
 }
 </style>
\ No newline at end of file

src/view/sjgl/ddkzConfig/ddkzConfigList.vue

@@ -31,7 +31,7 @@
                             @click="startExercise(scope.row)">启动</el-button>
                         <el-button v-if="scope.row.status.name == '进行中'" size="mini" type="warning"
                             @click="stopExercise(scope.row)">结束</el-button>
-                        <el-button  size="mini" type="primary"  @click="configExercise(scope.row)">配置</el-button>
+                        <el-button v-if="scope.row.status.value == 'CREATED'"  size="mini" type="primary"  @click="configExercise(scope.row)">配置</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -126,7 +126,6 @@ export default {
         queryChatRoomListFn(param) {
             getChatRoomList(param).then(res => {
                 this.meetingList = res;
-                console.log(res);
             });
         },
         searchChatList() {