diff --git a/src/jmapNew/shape/StationStand/ETrainDepart.js b/src/jmapNew/shape/StationStand/ETrainDepart.js index 3ac4b9e2b..27fddccd9 100644 --- a/src/jmapNew/shape/StationStand/ETrainDepart.js +++ b/src/jmapNew/shape/StationStand/ETrainDepart.js @@ -44,11 +44,14 @@ class ETrainDepart extends Group { hideMode() { this.trainDepart && this.trainDepart.hide(); - this.time && clearInterval(this.time); + // if (this.time) { + // clearInterval(this.time); + // this.timeStart = 30; + // } } showMode() { - this.timeStart = 30; + // this.timeStart = 30; this.create(`0${this.timeStart}`); this.trainDepart.show(); setTimeout(() => { @@ -67,6 +70,7 @@ class ETrainDepart extends Group { } } else { clearInterval(this.time); + this.timeStart = 30; } }, 1000); } diff --git a/src/views/newMap/displayNew/demonChat.vue b/src/views/newMap/displayNew/demonChat.vue index 66c46067a..7a661a649 100644 --- a/src/views/newMap/displayNew/demonChat.vue +++ b/src/views/newMap/displayNew/demonChat.vue @@ -36,14 +36,11 @@ export default { userRole: { type: String, required: true - }, - offsetBottom:{ - type: Number, - required: true } }, data() { return { + offsetBottom:15, scriptTip:'', isHasCoversition:false, conversitionId:'', @@ -67,7 +64,14 @@ export default { } }, watch:{ - '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态 + '$store.state.config.menuBarLoadedCount': function (val) { + this.$nextTick(() => { + this.offsetBottom = 15; + const menuBottom = document.getElementById('menuButton'); + this.offsetBottom = this.offsetBottom + (menuBottom ? menuBottom.offsetHeight || 0 : 0); + }); + }, + '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始获取仿真成员 getSimulationMemberList(this.group).then(resp => { let lastData = JSON.stringify(resp.data); const roleTypeList = ConstConfig.ConstSelect.roleTypeNew; diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue index 93ef57b8b..61aeb0041 100644 --- a/src/views/newMap/displayNew/menuDemon.vue +++ b/src/views/newMap/displayNew/menuDemon.vue @@ -1,6 +1,6 @@