joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
zyy 2020-07-30 10:03:14 +08:00
commit a229051584
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/views/newMap/displayNew/index.vue
View File

@ -160,12 +160,12 @@ export default {
computed:{ computed:{
...mapGetters([ ...mapGetters([
'canvasWidth' 'canvasWidth'
]), ]),
...mapGetters('map', [ ...mapGetters('map', [
'map', 'map',
'stationList' 'stationList'
]), ]),
// ...mapGetters('training', [ // ...mapGetters('training', [
// 'offsetStationCode' // 'offsetStationCode'
// ]), // ]),
mode() { mode() {
@ -220,8 +220,8 @@ export default {
this.setMode(); this.setMode();
}, },
'$store.state.app.windowSizeCount': function() { '$store.state.app.windowSizeCount': function() {
this.setWindowSize(); this.setWindowSize();
this.setPosition(); this.setPosition();
}, },
$route() { $route() {
this.initLoadData(); this.initLoadData();
@ -240,20 +240,21 @@ export default {
}); });
}, },
'stationList': function () { 'stationList': function () {
this.setStationList(); !this.isExam && !this.isLesson && this.setStationList();
}, },
'$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态 '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态
if (this.planRunning) { if (this.planRunning) {
this.$store.dispatch('training/simulationStart'); this.$store.dispatch('training/simulationStart');
} }
this.switchStationMode(this.showStation); this.isExam && this.$store.state.exam.deviceCode && this.setCenter(this.$store.state.exam.deviceCode);
!this.isExam && !this.isLesson && this.switchStationMode(this.showStation);
} }
}, },
async mounted() { async mounted() {
this.group = this.$route.query.group; this.group = this.$route.query.group;
this.setWindowSize(); this.setWindowSize();
await this.initLoadData(); await this.initLoadData();
this.setMode(); this.setMode();
}, },
beforeDestroy() { beforeDestroy() {
this.quit(this.group); this.quit(this.group);
@ -300,7 +301,7 @@ export default {
// 缩放设置 // 缩放设置
setWindowSize() { setWindowSize() {
const width = this.width; const width = this.width;
const height = this.height; const height = this.height;
this.$store.dispatch('config/resize', { width, height }); this.$store.dispatch('config/resize', { width, height });
// this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode }); // this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
}, },
@ -497,6 +498,8 @@ export default {
// } // }
setPosition() { setPosition() {
this.$nextTick(() => { this.$nextTick(() => {
this.offset = 10;
this.offsetBottom = 15;
const menuBar = document.getElementById('menuBar'); const menuBar = document.getElementById('menuBar');
const menuTool = document.getElementById('menuTool'); const menuTool = document.getElementById('menuTool');
const menuBottom = document.getElementById('menuButton'); const menuBottom = document.getElementById('menuButton');

3
src/views/newMap/jlmapNew/index.vue
View File

@ -133,9 +133,6 @@ export default {
} }
this.setCenter(code); this.setCenter(code);
}, },
'$store.state.exam.deviceCode': function (val) {
val && this.setCenter(val);
},
'$store.state.config.canvasSizeCount': function (val) { '$store.state.config.canvasSizeCount': function (val) {
this.resetSize(); this.resetSize();
}, },