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:
joylink_cuiweidong 2021-05-31 15:50:59 +08:00
commit 426677ab57
8 changed files with 33 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jlmap3d/jl3drailwaydrive/moveupdate/DrivingConnectNew.js
View File

@ -39,7 +39,7 @@ export function Jl3dDrivingNew(mixers,updatemmi,sound,translation,routegroup,sta
this.teststomp = new StompClient();
// let toppic = '/app/topic/simulation/client/'+routegroup+'/drive';
console.log(routegroup);
this.topic = '/user/queue/simulation/'+routegroup+'/trainPosition';
this.topic = '/queue/simulation/'+routegroup+'/trainPosition';
let header = {'X-Token': getToken() };
let connectmsg = {
type:'init',

4
src/jmapNew/painter.js
View File

@ -77,8 +77,7 @@ class Painter {
*/
add(device) {
try {
// const instance = shapefactory(device, this.$jmap);
const instance = this.newGraph(device);
const instance = device.instance || this.newGraph(device);
if (instance) {
device.instance = instance;
this.$transformHandle.transformView(instance);
@ -151,6 +150,7 @@ class Painter {
const trainDevice = this.$jmap.getDeviceByCode(item);
trainDevice.overLapIndex = index;
trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
trainDevice.instance = null;
this.add(trainDevice);
});

3
src/jmapNew/shape/graph/Station/index.js
View File

@ -778,7 +778,10 @@ export default class Station extends Group {
this.createTroButton(); // 创建轨道预览按钮
} else {
this.troButton && this.troButton.hide();
// this.troButton && this.troButton.dirty();
this.dirty();
}
console.log(this.model.showMode, '==', this.troButton);
}
setShowStation(flag) {
if (flag) {

1
src/jmapNew/shape/graph/StationStand/index.js
View File

@ -230,6 +230,7 @@ class StationStand extends Group {
setShowMode() {
const showMode = this.model.showMode;
const showConditions = this.style.StationStand.common.functionButtonShow;
this.setVisible(this.model.visible);
if (!showConditions || showConditions === '01' || showMode === showConditions) {
this.stopJumpLamp && this.stopJumpLamp.show();
this.cancelStopJumpLamp && this.cancelStopJumpLamp.show();

4
src/views/jlmap3d/drive/drivecontrol/drivecontrol.vue
View File

@ -425,7 +425,7 @@ import axios from 'axios';
/* position: absolute; */
color: #FFFFFF;
font-size: 4px;
font-size: 13px;
}
.buttontext2{
width:100%;
@ -433,7 +433,7 @@ import axios from 'axios';
position: absolute;
color: #FFFFFF;
font-size: 4px;
font-size: 13px;
}

21
src/views/newMap/displayBaSiDi/rps.vue
View File

@ -31,7 +31,6 @@ export default {
return {
dialogShow: false,
mapData: null,
enter: false,
selfJmap: null
};
},
@ -72,21 +71,17 @@ export default {
doShow() {
this.dialogShow = true;
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$jlmap && this.$jlmap.clearTrainView();
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.$nextTick(function() {
if (!this.enter) {
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
this.enter = true;
} else {
this.$jlmap.clearTrainView();
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
});
},
destroy() {

21
src/views/newMap/displayBaSiDi/tro.vue
View File

@ -41,7 +41,6 @@ export default {
dialogShow: false,
mapData: null,
deviceCode: '',
enter: false,
selfJmap: null,
buttonDbup: ButtonDbupIcon,
buttonRight: ButtonRightIcon,
@ -84,22 +83,18 @@ export default {
methods: {
doShow() {
this.dialogShow = true;
this.$jlmap && this.$jlmap.clearTrainView();
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.$nextTick(function() {
if (!this.enter) {
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
this.enter = true;
} else {
this.$jlmap.clearTrainView();
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '05');
this.$store.dispatch('training/updateMapState', list);
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '05');
this.$store.dispatch('training/updateMapState', list);
});
},
destroy() {

24
src/views/newMap/displayBaSiDi/troDetail.vue
View File

@ -49,7 +49,6 @@ export default {
buttonDbup: ButtonDbupIcon,
buttonRight: ButtonRightIcon,
buttonLeft: ButtonLeftIcon,
enter: false,
selfJmap: null
};
},
@ -93,25 +92,18 @@ export default {
doShow(deviceCode) {
this.dialogShow = true;
if (this.selfJmap) { Vue.prototype.$jlmap = this.selfJmap; }
this.$jlmap && this.$jlmap.clearTrainView();
this.$store.dispatch('config/resize', { width:this.width, height: this.height });
this.deviceCode = deviceCode;
if (this.enter) {
this.$refs.mapCanvas && this.$refs.mapCanvas.setCenter(this.deviceCode);
}
this.$nextTick(function() {
if (!this.enter) {
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
this.enter = true;
} else {
this.$jlmap.clearTrainView();
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
this.$refs.mapCanvas.setMap(this.$store.state.map.map);
const mapDevice = this.$store.state.map.mapDevice;
const list = [];
for (const key in mapDevice) {
list.push(mapDevice[key]);
}
this.$jlmap.updateShowMode(list, '02');
this.$store.dispatch('training/updateMapState', list);
});
},
doClose() {