diff --git a/src/views/trainRoom/e-device.vue b/src/views/trainRoom/e-device.vue index cde962867..9678ff7fe 100644 --- a/src/views/trainRoom/e-device.vue +++ b/src/views/trainRoom/e-device.vue @@ -135,6 +135,7 @@ export default { height: 30px; line-height: 30px; padding-left: 10px; + display: flow-root; } .delete { diff --git a/src/views/trainRoom/e-role.vue b/src/views/trainRoom/e-role.vue index 0be00a3aa..effec5372 100644 --- a/src/views/trainRoom/e-role.vue +++ b/src/views/trainRoom/e-role.vue @@ -145,6 +145,7 @@ export default { height: 30px; line-height: 30px; padding-left: 10px; + display: flow-root; &:hover { background: #D6E0F2; diff --git a/src/views/trainRoom/index.vue b/src/views/trainRoom/index.vue index abe1eced5..adad129cf 100644 --- a/src/views/trainRoom/index.vue +++ b/src/views/trainRoom/index.vue @@ -164,7 +164,7 @@ export default { if (user.userRole) { if (index >= 0) { this.checkUserState(user, this.members[index]); - this.members.splice(index, 1, Object.assign(this.members[index], this.transformUser(user))); + this.members.splice(index, 1, this.transformUser(user)); } else { this.checkUserState(user, null); this.members.push(this.transformUser(user)); @@ -211,7 +211,7 @@ export default { this.jumpOutRoom(); } } else if (old.userRole) { - if (!user.inRoom) { + if (old.inRoom && !user.inRoom) { this.$store.dispatch('socket/setChatContent', {...message, roomTip: `${user.nickName}离线`}); if (this.userId == user.id) { this.jumpOutRoom();