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 2020-03-19 10:23:24 +08:00
parent 8ba124ab6f
commit acc05f770e
4 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/config/skinCode/chengdu_03.js
View File

@ -450,7 +450,8 @@ class SkinCode extends defaultStyle {
stroke: '#FFFFFF', // 框的颜色
fill: 'rgba(0,0,0,0)', // 填充色
radiusR: 6, // 控制灯大小
controlColor: '#b5b3b3' // 控制灯颜色 (灰色)
controlColor: '#b5b3b3', // 控制灯颜色 (灰色)
lightColor: '#FFFF00' // 控制灯亮颜色
}
};
this[deviceType.AutomaticRoute] = {
@ -464,7 +465,8 @@ class SkinCode extends defaultStyle {
lamp: {
fill: 'rgba(0,0,0,0)', // 填充色
radiusR: 6, // 控制灯大小
controlColor: '#b5b3b3' // 控制灯颜色 (灰色)
controlColor: '#b5b3b3', // 控制灯颜色 (灰色)
lightColor: '#FFFF00' // 控制灯亮颜色
}
};
this[deviceType.AutoTurnBack] = {

8
src/jmapNew/map.js
View File

@ -331,6 +331,13 @@ class Jlmap {
if (elem.deviceType === 'ROUTE') { // 处理进路数据状态
store.dispatch('map/updateRouteState', elem);
const route = this.routeData[code];
if (route.automaticRouteCode) {
const automaticRoute = this.mapDevice[route.automaticRouteCode];
const automaticRouteStatus = {fleetMode: elem.fleetMode};
if (this.hookHandle(automaticRoute, automaticRouteStatus)) {
this.$painter.update(automaticRoute);
}
}
const signalDevice = this.mapDevice[route.startSignalCode];
const signalStatus = {atsControl: elem.atsControl, fleetMode: elem.fleetMode};
if (this.hookHandle(signalDevice, signalStatus)) {
@ -346,7 +353,6 @@ class Jlmap {
// }
}
}
});
// 状态后处理

5
src/jmapNew/shape/AutomacticRoute/index.js
View File

@ -90,6 +90,11 @@ export default class AutomacticRoute extends Group {
// 设置状态
setState(model) {
if (!this.isShowShape) return;
if (this.model.fleetMode) {
this.control && this.control.setStyle('fill', this.style.AutomaticRoute.lamp.lightColor);
} else {
this.control && this.control.setStyle('fill', this.style.AutomaticRoute.lamp.controlColor);
}
}
createMouseEvent() {

3
src/store/modules/map.js
View File

@ -667,6 +667,9 @@ const map = {
routeDataList.forEach(data => {
state.routeData[data.code] = data;
});
state.map.automaticRouteButtonList.forEach(item => {
state.routeData[item.automaticRouteCode].automaticRouteCode = item.code;
});
state.routeList = routeDataList;
},
setAutoReentryData: (state, autoReentryList) => {