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:
ival 2019-08-05 09:58:33 +08:00
parent 1e6a5510ac
commit 711534599f
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/jmap/shape/Signal/ESigAuto.js
View File

@ -1,6 +1,6 @@
import Polygon from 'zrender/src/graphic/shape/Polygon'; import Polygon from 'zrender/src/graphic/shape/Polygon';
import Group from 'zrender/src/container/Group'; import Group from 'zrender/src/container/Group';
import { arrows } from '../utils/ShapePoints'; import { arrow } from '../utils/ShapePoints';
class ESigPass extends Group { class ESigPass extends Group {
constructor(model) { constructor(model) {
@ -14,10 +14,10 @@ class ESigPass extends Group {
const model = this.model; const model = this.model;
const style = this.model.style; const style = this.model.style;
const rotation = model.drict != 1? 0 : Math.PI; const rotation = model.drict != 1? 0 : Math.PI;
const point = arrows(model.x, model.y, style.Signal.signalAutoWidth, style.Signal.lamp.radiusR * 0.8); const point = arrow(model.x, model.y, style.Signal.signalAutoWidth, style.Signal.lamp.radiusR * 0.8);
this.isNew = true; this.isNew = true;
this.arrows = new Polygon({ this.arrow = new Polygon({
zlevel: model.zlevel, zlevel: model.zlevel,
z: model.z, z: model.z,
rotation: rotation, rotation: rotation,
@ -30,20 +30,20 @@ class ESigPass extends Group {
fill: model.fill fill: model.fill
} }
}); });
this.add(this.arrows); this.add(this.arrow);
} }
} }
// 停止动画 // 停止动画
animationRecover() { animationRecover() {
this.create(); this.create();
this.arrows.stopAnimation(false); this.arrow.stopAnimation(false);
} }
// 箭头颜色 // 箭头颜色
setColor(color) { setColor(color) {
this.create(); this.create();
this.arrows.setStyle('fill', color); this.arrow.setStyle('fill', color);
} }
// 箭头闪烁 // 箭头闪烁
@ -51,9 +51,9 @@ class ESigPass extends Group {
this.create(); this.create();
const style = this.model.style; const style = this.model.style;
const fill = this.arrows.style.Signal.fill; const fill = this.arrow.style.fill;
this.arrows.animate(true) this.arrow.animate(true)
.when(1000, { fill: style.backgroundColor, stroke: style.style.backgroundColor }) .when(1000, { fill: style.backgroundColor, stroke: style.style.backgroundColor })
.when(2000, { fill: fill, stroke: style.style.Signal.sidelineColor }) .when(2000, { fill: fill, stroke: style.style.Signal.sidelineColor })
.when(3000, { fill: style.style.backgroundColor, stroke: style.style.backgroundColor }) .when(3000, { fill: style.style.backgroundColor, stroke: style.style.backgroundColor })
@ -64,7 +64,7 @@ class ESigPass extends Group {
// 隐藏 // 隐藏
hide() { hide() {
this.create(); this.create();
this.arrows.hide(); this.arrow.hide();
} }
// 显示 // 显示

13
src/jmap/shape/Signal/index.js
View File

@ -459,6 +459,7 @@ class Signal extends Group {
} }
/** 设置自动类型*/ /** 设置自动类型*/
model.autoType = '04';
switch (model.autoType) { switch (model.autoType) {
case '01': this.setAutoClose(); break; // 隐藏 隐藏自动信号和自动进路 case '01': this.setAutoClose(); break; // 隐藏 隐藏自动信号和自动进路
case '02': this.setAutoSignalOpen(); break; // 显示 设置自动信号模式状态类型 case '02': this.setAutoSignalOpen(); break; // 显示 设置自动信号模式状态类型
@ -467,12 +468,12 @@ class Signal extends Group {
} }
/** 延时解锁*/ /** 延时解锁*/
model.delayType = '02'; // model.delayType = '02';
switch (model.delayType) { // switch (model.delayType) {
case '01': this.setDelayUnlock(); break; // 未延时解锁 // case '01': this.setDelayUnlock(); break; // 未延时解锁
case '02': this.setDelayUnlock(); break; // 人工闭塞延时解锁 // case '02': this.setDelayUnlock(); break; // 人工闭塞延时解锁
case '03': this.setDelayUnlock(); break; // 自动闭塞延时解锁 // case '03': this.setDelayUnlock(); break; // 自动闭塞延时解锁
} // }
/** 信号机进路办理，先停止动画，再判断当前颜色是否闪烁*/ /** 信号机进路办理，先停止动画，再判断当前颜色是否闪烁*/
if (model.routeSetting && (model.autoType == '03' || model.autoType == '04')) { if (model.routeSetting && (model.autoType == '03' || model.autoType == '04')) {