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:
fan 2020-06-11 17:28:25 +08:00
commit 979f116f3a
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/fuzhou_01.js
View File

@ -13,7 +13,7 @@ class SkinCode extends defaultStyle {
show: true, // 物理区段名称显示
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 18, // 文字离区段距离
fontSize: 11, // 字体大小
fontSize: 12, // 字体大小
fontWeight: 'normal', // 字体粗细
fontColor: '#FFFFFF', // 字体颜色
textAlign: 'center', // 水平对齐方式
@ -24,7 +24,7 @@ class SkinCode extends defaultStyle {
show: true, // 逻辑区段名称显示
position: 0, // 区段名称位置 1 上面 -1 下面 0 对称
distance: 6, // 文字离区段距离
fontSize: 8, // 字体大小
fontSize: 12, // 字体大小
fontWeight: 'normal', // 字体粗细
fontColor: '#FFFFFF', // 字体颜色
textAlign: 'center', // 水平对齐方式

2
src/jmapNew/map.js
View File

@ -391,7 +391,7 @@ class Jlmap {
(list || []).forEach((elem, index) => {
const code = elem.code;
const type = elem._type;
if (elem.deviceType === 'ROUTE') { // 处理进路数据状态
if (elem.deviceType === 'ROUTE' && this.logicData.routeData) { // 处理进路数据状态
store.dispatch('map/updateRouteState', elem);
const route = this.logicData.routeData[code];
if (route.automaticRouteCode) {

2
src/jmapNew/shape/StationStand/index.js
View File

@ -489,7 +489,7 @@ class StationStand extends Group {
if (!this.isShowShape) return;
// 新版地图使用新版状态变更方式
this.recover();
model.free && this.spare(); /** 空闲*/
!model.trainParking && this.spare(); /** 空闲*/
model.trainParking && this.stop(); /** 列车停站*/
model.emergencyClosed && this.emergentClose(); /** 站台紧急关闭*/

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

@ -791,7 +791,9 @@ const map = {
state.autoReentryData[status.code] = deepAssign(state.autoReentryData[status.code], status);
},
updateTrainState:(state, status) =>{
state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
if (state.map.trainList) {
state.map.trainList[parseInt(status.code) - 1] = deepAssign(state.map.trainList[parseInt(status.code) - 1] || {}, status);
}
},
updateStationStand: (state, status) => {
const holdIndex = state.holdStandList.indexOf(status.code);