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:
lVAL 2021-02-23 18:11:11 +08:00
commit 460b48cd7e
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,9 @@ class SkinCode extends defaultStyle {
currentModeColor:'#0f0', // 当前被控制时字体颜色
dispatherColor:'#FFF', // 非当前控制 行调控制时字体颜色
centralizedColor:'#000', // 非当前控制 行值集中站控制时字体颜色
noCentralizedColor:'#1BFAEB' // 非当前控制 行值非集中站控制时字体颜色
noCentralizedColor:'#1BFAEB', // 非当前控制 行值非集中站控制时字体颜色
defaultBackColor:'rgba(0,0,0,0)', // 默认背景颜色
emergencyBackColor:'#f00' // 紧急背景颜色
},
kmPostShow: false, // 公里标显示

15
src/jmapNew/shape/Station/EStationText.js
View File

@ -80,9 +80,18 @@ class EStationText extends Group {
this.subheadText && this.subheadText.setStyle('textFill', color);
}
}
getBoundingRect() {
return this.stationName.getBoundingRect();
}
setBackground(color) {
const style = this.model.style;
if (style.Station.StationControl.disPlayNone) {
console.log('///////////');
this.stationName.setStyle('textBackgroundColor', color);
this.subheadText && this.subheadText.setStyle('textBackgroundColor', color);
}
}
getBoundingRect() {
return this.stationName.getBoundingRect();
}
}
export default EStationText;

15
src/jmapNew/shape/Station/index.js
View File

@ -502,6 +502,7 @@ export default class Station extends Group {
if (this.style.Station.stationText.isSpecialType) {
// if()
this.stationText.setColor(this.style.Station.stationText.noneModeColor);
this.stationText.setBackground(this.style.Station.stationText.defaultBackColor);
// sationEle.controller
} else {
this.stationText && this.stationText.stopAnimate();
@ -527,10 +528,15 @@ export default class Station extends Group {
// console.log(model.controller, model.centralized, '5555555555555');
model.preResetValidDuration && this.handlePreResetLamp();
model.controller && this.handleComplexControl(model.controller);
if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller) && model.centralized) {
model.emergencyController && this.handleEmergencyController();
if (this.style.Station.syncCentralizeStation && (model.controlMode || model.controller || model.emergencyController) && model.centralized) {
model.chargeStationCodeList.forEach(item => {
const device = store.getters['map/getDeviceByCode'](item);
device && device.instance && device.instance.recover();
if (model.emergencyController) {
device.emergencyController = model.emergencyController;
device && device.instance && device.instance.handleEmergencyController();
}
if (model.controller) {
device.controller = model.controller;
device && device.instance && device.instance.handleComplexControl(model.controller);
@ -552,6 +558,13 @@ export default class Station extends Group {
handlePreResetLamp() {
this.controlPreReset && this.controlPreReset.setColor('#f00');
}
handleEmergencyController() {
if (this.style.Station.stationText.isSpecialType) {
this.stationText.setBackground(this.style.Station.stationText.emergencyBackColor);
}
}
handleComplexControl(controller) {
// const controller = model.controller;
const memberData = store.state.training.memberData;