diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue new file mode 100644 index 000000000..66c46067a --- /dev/null +++ b/src/views/newMap/displayNew/demonChat.vue @@ -0,0 +1,335 @@ + + diff --git a/src/views/newMap/displayNew/designIndex.vue b/src/views/newMap/displayNew/designIndex.vue index b4c036b1a..1e9b571ae 100644 --- a/src/views/newMap/displayNew/designIndex.vue +++ b/src/views/newMap/displayNew/designIndex.vue @@ -340,6 +340,7 @@ export default { const memberList = this.$store.state.training.memberData; if (data.id) { memberList[data.id].userId = this.$store.state.user.id; + memberList[data.id].name = this.$store.state.user.nickname; memberList[data.id].disabled = true; } let lastData = JSON.stringify(memberList); diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue index 9ad68cfad..d886fb4a5 100644 --- a/src/views/newMap/displayNew/index.vue +++ b/src/views/newMap/displayNew/index.vue @@ -107,7 +107,7 @@ import MenuPractice from '@/views/newMap/displayNew/menuPractice'; import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive'; import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice'; import Scheduling from './demon/scheduling'; -import { clearSimulation, getSimulationInfoNew, getSimulationMemberList, getAllSimulationUser} from '@/api/simulation'; +import { clearSimulation, getSimulationInfoNew} from '@/api/simulation'; import { getTrainingDetailNew } from '@/api/jmap/training'; // loadScriptNew, , scriptExecuteNew import { mapGetters } from 'vuex'; @@ -339,7 +339,6 @@ export default { } this.checkLoginLineTimer(); this.checkMouseStatusTimer(); - this.initMemberUserInfo(); } catch (error) { this.$messageBox(`初始化失败: ${error.message}`); this.endViewLoading(); @@ -383,18 +382,6 @@ export default { this.endViewLoading(); } }, - initMemberUserInfo() { - getSimulationMemberList(this.$route.query.group).then(resp => { - this.$store.dispatch('training/setMemberList', {memberList:resp.data, userId: this.$store.state.user.id}); - }).catch(() => { - this.$messageBox('获取仿真成员列表失败!'); - }); - getAllSimulationUser(this.$route.query.group).then(resp => { - this.$store.dispatch('training/setSimulationUserList', resp.data); - }).catch(() => { - this.$messageBox('获取所有仿真用户失败!'); - }); - }, // 加载实操地图数据 async initPracticeData() { this.$store.dispatch('training/end', TrainingMode.NORMAL); diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index 9e4cb6d46..93ef57b8b 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -1,6 +1,6 @@