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

南京二空白处操作调整

Browse Source
This commit is contained in:
fan 2022-12-27 14:24:25 +08:00
parent 7e5ad3b9cd
commit 36fddc3a12
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/jmapNew/theme/nanjing_02/menus/localWorkMenuButton.vue
View File

@ -332,7 +332,7 @@ export default {
return OperationEvent.Command.commandHaerbin.confrimCr2.domId;
},
stationContorl() {
return this.getStationControl(this.currentSelected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.map.showCentralizedStationCode}) || {};
return this.getStationControl(this.currentSelected || {}) || this.getStationControl({_type: 'Station', code: this.$store.state.training.roleDeviceCode}) || {};
},
isLogin() {
return this.isIgnoreLogin || (this.loginActive && this.checkBelongCentralizedStationByInputStr(this.inputStr));
@ -400,7 +400,7 @@ export default {
} else {
const step = {
operation: 'click',
code: this.$store.state.map.showCentralizedStationCode,
code: this.$store.state.training.roleDeviceCode,
subType:this.$store.state.menuOperation.subType
};
@ -419,7 +419,7 @@ export default {
}
},
'$store.state.map.showCentralizedStationCode': function(val) {
'$store.state.training.roleDeviceCode': function(val) {
this.cancle();
if (!this.oldSelected) {
this.handleBasicMenu();
@ -427,10 +427,6 @@ export default {
},
'$store.state.map.mapStationStateUpdateCount': function() {
this.initCentralizedStationList([...this.menuCmdList]);
},
'$store.state.training.steps': function(steps) {
this.initTrainingStation(steps);
this.handleBasicMenu();
}
},
mounted() {
@ -481,15 +477,6 @@ export default {
}
return [stationCode, centralStationCode];
},
initTrainingStation(steps) {
if (steps && steps.length) {
const code = steps[0].code;
this.stationObj = this.getStationControl(this.$store.getters['map/getDeviceByCode'](code));
if (this.stationObj) {
this.$store.dispatch('map/setShowCentralizedStationCode', this.stationObj.code);
}
}
},
handleTrainOperate(type) {
this.trainOperateType = type;
},
@ -712,7 +699,7 @@ export default {
EventBus.$emit('sendMsg', {message: this.selectedObj.name});
},
handleBasicMenu() {
this.stationObj = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
this.stationObj = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
this.deviceHighLight(this.oldDevice, false);
if (this.oldClickObj) {
this.deviceHighLight(this.oldClickObj, false);
@ -722,8 +709,8 @@ export default {
this.initCentralizedStationList(this.basicParamList, this.stationObj);
this.param = {
stationCode: this.$store.state.map.showCentralizedStationCode,
stationCodes: [this.$store.state.map.showCentralizedStationCode]
stationCode: this.$store.state.training.roleDeviceCode,
stationCodes: [this.$store.state.training.roleDeviceCode]
};
EventBus.$emit('sendMsg', { message: this.stationObj ? this.stationObj.name : '' });

6
src/views/newMap/display/terminals/localWork.vue
View File

@ -111,9 +111,9 @@ export default {
}
this.$jlmap.updateShowStation(list);
this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap);
this.$jlmap.updatePicture(deviceList);
this.$jlmap.updateTransform(picture.scaling, picture.origin);
this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
// this.$jlmap.updatePicture(deviceList);
// this.$jlmap.updateTransform(picture.scaling, picture.origin);
// this.$store.dispatch('map/setShowCentralizedStationCode', this.centralizedStationMap[this.roleDeviceCode]);
setTimeout(() => {
this.$jlmap.updatePicture(deviceList);
const trainingDetail = this.$store.state.trainingNew.trainingDetail;