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 2022-08-11 11:18:38 +08:00
parent 319cd60d6c
commit 1a80ae7558
3 changed files with 353 additions and 326 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,7 +261,9 @@ class SkinCode extends defaultStyle {
this[deviceType.SignalButton] = { this[deviceType.SignalButton] = {
shape: 'roundWithDock', shape: 'roundWithDock',
fillColor: '#808080', fillColor: '#808080',
showName: true showName: true,
selectColor: '#0000ff',
flashingColor: '#ffff00'
}; };
this[deviceType.SwitchFault] = { this[deviceType.SwitchFault] = {
displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示） displayCondition: '01', // 显示条件 （01所有模式下显示 02 行调显示 03现地显示）

17
src/jmapNew/shape/graph/Signal/index.js
View File

@ -647,7 +647,6 @@ class Signal extends Group {
} }
this.sigPost.setHorColor(this.style.Signal.post.openHorColor); this.sigPost.setHorColor(this.style.Signal.post.openHorColor);
} }
} }
/* 侧向开放 */ /* 侧向开放 */
openLateral(logicLight) { openLateral(logicLight) {
@ -726,6 +725,14 @@ class Signal extends Group {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor); this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.yellowColor);
this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.greenColor); this.lamps[1] && this.lamps[1].setColor(this.style.Signal.lamp.greenColor);
} }
redFlash() {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.redColor);
this.lamps[0].setAnimationStart(this.style.Signal.lamp.redColor);
}
blueFlash() {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.blueColor);
this.lamps[0].setAnimationStart(this.style.Signal.lamp.blueColor);
}
lampWhite() { lampWhite() {
if (this.lamps.length === 1) { if (this.lamps.length === 1) {
this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.whiteColor); this.lamps[0] && this.lamps[0].setColor(this.style.Signal.lamp.whiteColor);
@ -1086,6 +1093,14 @@ class Signal extends Group {
this.greenYellow(); this.greenYellow();
break; break;
} }
case 'RF': {
this.redFlash();
break;
}
case 'BF': {
this.blueFlash();
break;
}
default: { default: {
this.close(model.logicLight); // 信号关闭 this.close(model.logicLight); // 信号关闭
break; break;

212
src/jmapNew/shape/graph/SignalButton/index.js
View File

@ -1,10 +1,10 @@
import Group from 'zrender/src/container/Group' import Group from 'zrender/src/container/Group';
import Rect from 'zrender/src/graphic/shape/Rect' import Rect from 'zrender/src/graphic/shape/Rect';
import Line from 'zrender/src/graphic/shape/Line' import Line from 'zrender/src/graphic/shape/Line';
import Text from 'zrender/src/graphic/Text' import Text from 'zrender/src/graphic/Text';
import Arc from 'zrender/src/graphic/shape/Arc' import Arc from 'zrender/src/graphic/shape/Arc';
import Circle from 'zrender/src/graphic/shape/Circle' import Circle from 'zrender/src/graphic/shape/Circle';
import store from '@/store/index' import store from '@/store/index';
const typeList = [ const typeList = [
'PICK_ASSIST', 'PICK_ASSIST',
'DEPART_ASSIST', 'DEPART_ASSIST',
@ -20,33 +20,33 @@ const typeList = [
'BLOCK', 'BLOCK',
'UNBLOCK', 'UNBLOCK',
'CHANGE_DIRECTION' 'CHANGE_DIRECTION'
] ];
export default class SignalButton extends Group { export default class SignalButton extends Group {
constructor(model, { style }) { constructor(model, { style }) {
super() super();
this._code = model.code this._code = model.code;
this._type = model._type this._type = model._type;
this.zlevel = model.zlevel this.zlevel = model.zlevel;
const pictureDevice = store.getters['map/getPictureDeviceByCode'](model.code) const pictureDevice = store.getters['map/getPictureDeviceByCode'](model.code);
if (pictureDevice) { if (pictureDevice) {
this.computedPosition = pictureDevice.position this.computedPosition = pictureDevice.position;
} else { } else {
this.computedPosition = model.position this.computedPosition = model.position;
} }
this.z = 0 this.z = 0;
this.model = model this.model = model;
this.style = style this.style = style;
this.pressed = false this.pressed = false;
// Line // Line
this.create() this.create();
this.setState(model) this.setState(model);
} }
create() { create() {
const model = this.model const model = this.model;
const computedPosition = this.computedPosition const computedPosition = this.computedPosition;
const fillColor = this.getTypeColor() const fillColor = this.getTypeColor();
if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) { if (this.style.SignalButton && this.style.SignalButton.shape === 'roundWithDock' && typeList.includes(model.type)) {
const circle1 = new Circle({ const circle1 = new Circle({
zlevel: this.zlevel, zlevel: this.zlevel,
@ -61,7 +61,7 @@ export default class SignalButton extends Group {
lineWidth: 1, lineWidth: 1,
fill: fillColor fill: fillColor
} }
}) });
const circle2 = new Circle({ const circle2 = new Circle({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -73,7 +73,7 @@ export default class SignalButton extends Group {
style: { style: {
fill: '#000' fill: '#000'
} }
}) });
const circle3 = new Circle({ const circle3 = new Circle({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z, z: this.z,
@ -85,13 +85,13 @@ export default class SignalButton extends Group {
style: { style: {
fill: '#eee' fill: '#eee'
} }
}) });
this.arcShape = circle1 this.arcShape = circle1;
this.arcShapeDock1 = circle2 this.arcShapeDock1 = circle2;
this.arcShapeDock2 = circle3 this.arcShapeDock2 = circle3;
this.add(circle1) this.add(circle1)
.add(circle2) .add(circle2)
.add(circle3) .add(circle3);
} else { } else {
this.rectButton = new Rect({ this.rectButton = new Rect({
zlevel: this.zlevel, zlevel: this.zlevel,
@ -108,8 +108,8 @@ export default class SignalButton extends Group {
lineWidth: 1, lineWidth: 1,
fill: fillColor fill: fillColor
} }
}) });
this.add(this.rectButton) this.add(this.rectButton);
} }
this.leftLine = new Line({ this.leftLine = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
@ -124,9 +124,9 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#ff0000' stroke: '#ff0000'
} }
}) });
this.add(this.leftLine) this.add(this.leftLine);
this.leftLine.hide() this.leftLine.hide();
this.rightLine = new Line({ this.rightLine = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -140,9 +140,9 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#ff0000' stroke: '#ff0000'
} }
}) });
this.add(this.rightLine) this.add(this.rightLine);
this.rightLine.hide() this.rightLine.hide();
this.leftBoard = new Line({ this.leftBoard = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -156,9 +156,9 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#FFFFFF' stroke: '#FFFFFF'
} }
}) });
this.add(this.leftBoard) this.add(this.leftBoard);
this.leftBoard.hide() this.leftBoard.hide();
this.topBoard = new Line({ this.topBoard = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -172,9 +172,9 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#FFFFFF' stroke: '#FFFFFF'
} }
}) });
this.add(this.topBoard) this.add(this.topBoard);
this.topBoard.hide() this.topBoard.hide();
this.rightBoard = new Line({ this.rightBoard = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -188,9 +188,9 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#A0A0A0' stroke: '#A0A0A0'
} }
}) });
this.add(this.rightBoard) this.add(this.rightBoard);
this.rightBoard.hide() this.rightBoard.hide();
this.bottomBoard = new Line({ this.bottomBoard = new Line({
zlevel: this.zlevel, zlevel: this.zlevel,
z: this.z + 1, z: this.z + 1,
@ -204,10 +204,10 @@ export default class SignalButton extends Group {
lineWidth: 2, lineWidth: 2,
stroke: '#A0A0A0' stroke: '#A0A0A0'
} }
}) });
this.add(this.bottomBoard) this.add(this.bottomBoard);
this.bottomBoard.hide() this.bottomBoard.hide();
const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'] const hasTextList = ['PASS', 'ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'ACCIDENT', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'];
if (hasTextList.includes(model.type) || (this.style.SignalButton && this.style.SignalButton.showName)) { if (hasTextList.includes(model.type) || (this.style.SignalButton && this.style.SignalButton.showName)) {
this.buttonText = new Text({ this.buttonText = new Text({
zlevel: this.zlevel, zlevel: this.zlevel,
@ -223,110 +223,120 @@ export default class SignalButton extends Group {
textAlign: 'middle', textAlign: 'middle',
textVerticalAlign: 'top' textVerticalAlign: 'top'
} }
}) });
this.add(this.buttonText) this.add(this.buttonText);
} }
} }
startAnimate() { startAnimate(color) {
// let color = this.getTypeColor();
// if (this.style.SignalButton && this.style.SignalButton.flashingColor) {
// color = this.style.SignalButton.flashingColor;
// }
this.rectButton && this.rectButton &&
this.rectButton this.rectButton
.animateStyle(true) .animateStyle(true)
.when(0, { fill: '#000' }) .when(0, { fill: '#000' })
.when(1000, { fill: this.getTypeColor() }) .when(1000, { fill: color })
.when(2000, { fill: '#000' }) .when(2000, { fill: '#000' })
.start() .start();
} }
stopAnimation() { stopAnimation() {
this.rectButton && this.rectButton.stopAnimation(true) this.rectButton && this.rectButton.stopAnimation(true);
// this.arcFlash && this.arcFlash.stopAnimation(false); // this.arcFlash && this.arcFlash.stopAnimation(false);
} }
getTypeColor() { getTypeColor() {
if (this.style.SignalButton && this.style.SignalButton.fillColor && typeList.includes(this.model.type)) { if (this.style.SignalButton && this.style.SignalButton.fillColor && typeList.includes(this.model.type)) {
return this.style.SignalButton.fillColor return this.style.SignalButton.fillColor;
} }
let color = '' let color = '';
const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'] const list = ['ASSIST', 'ACCIDENT', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'RECOVERY', 'OCCLUSION'];
if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') { if (this.model.type === 'FLEXIBLE' || this.model.type === 'SHUNT_TERMINAL') {
color = '#808080' color = '#808080';
} else if (this.model.type === 'GUIDE') { } else if (this.model.type === 'GUIDE') {
color = '#5050E1' color = '#5050E1';
} else if (list.includes(this.model.type)) { } else if (list.includes(this.model.type)) {
color = '#ccc' color = '#ccc';
} else { } else {
color = '#008000' color = '#008000';
} }
return color return color;
} // } //
recover() { recover() {
this.stopAnimation() this.stopAnimation();
this.rectButton && this.rectButton.setStyle({ fill: this.getTypeColor() }) this.rectButton && this.rectButton.setStyle({ fill: this.getTypeColor() });
this.arcShape && this.arcShape.setStyle({ fill: this.getTypeColor() }) this.arcShape && this.arcShape.setStyle({ fill: this.getTypeColor() });
this.rightLine && this.rightLine.hide() this.rightLine && this.rightLine.hide();
this.leftLine && this.leftLine.hide() this.leftLine && this.leftLine.hide();
this.rectButton && this.rectButton.show() this.rectButton && this.rectButton.show();
this.arcShape && this.arcShape.show() this.arcShape && this.arcShape.show();
this.arcShapeDock1 && this.arcShapeDock1.show() this.arcShapeDock1 && this.arcShapeDock1.show();
this.arcShapeDock2 && this.arcShapeDock2.show() this.arcShapeDock2 && this.arcShapeDock2.show();
this.buttonText && this.buttonText.show() this.buttonText && this.buttonText.show();
this.leftBoard && this.leftBoard.hide() this.leftBoard && this.leftBoard.hide();
this.rightBoard && this.rightBoard.hide() this.rightBoard && this.rightBoard.hide();
this.topBoard && this.topBoard.hide() this.topBoard && this.topBoard.hide();
this.bottomBoard && this.bottomBoard.hide() this.bottomBoard && this.bottomBoard.hide();
} }
blockShow() { blockShow() {
this.rightLine && this.rightLine.show() this.rightLine && this.rightLine.show();
this.leftLine && this.leftLine.show() this.leftLine && this.leftLine.show();
} }
setState(model) { setState(model) {
this.recover() this.recover();
// { value: 'ASSIST', label: '总辅助按钮' }, // { value: 'ASSIST', label: '总辅助按钮' },
// { value: 'PICK_ASSIST', label: '接辅助按钮' }, // { value: 'PICK_ASSIST', label: '接辅助按钮' },
// { value: 'DEPART_ASSIST', label: '发辅助按钮' }, // { value: 'DEPART_ASSIST', label: '发辅助按钮' },
const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION'] const list = ['ASSIST', 'PICK_ASSIST', 'DEPART_ASSIST', 'CHANGE_DIRECTION', 'ACCIDENT', 'RECOVERY', 'OCCLUSION'];
if (list.includes(model.type)) { if (list.includes(model.type)) {
if (this.rectButton) { if (this.rectButton) {
if (model.pressDown) { if (model.pressDown) {
this.rectButton.setStyle({ fill: '#FFFF00' }) this.rectButton.setStyle({ fill: '#FFFF00' });
} else { } else {
this.rectButton.setStyle({ fill: this.getTypeColor() }) this.rectButton.setStyle({ fill: this.getTypeColor() });
} }
} }
} }
// { value: 'PICK', label: '接车按钮' }, // { value: 'PICK', label: '接车按钮' },
// { value: 'SHUNT_TERMINAL', label: '调车终端按钮' }, // { value: 'SHUNT_TERMINAL', label: '调车终端按钮' },
if (!store.getters['map/checkDeviceShow'](this._code)) { if (!store.getters['map/checkDeviceShow'](this._code)) {
this.buttonText && this.buttonText.hide() this.buttonText && this.buttonText.hide();
this.rectButton && this.rectButton.hide() this.rectButton && this.rectButton.hide();
this.leftLine && this.leftLine.hide() this.leftLine && this.leftLine.hide();
this.rightLine && this.rightLine.hide() this.rightLine && this.rightLine.hide();
this.arcShape && this.arcShape.hide() this.arcShape && this.arcShape.hide();
this.arcShapeDock1 && this.arcShapeDock1.hide() this.arcShapeDock1 && this.arcShapeDock1.hide();
this.arcShapeDock2 && this.arcShapeDock2.hide() this.arcShapeDock2 && this.arcShapeDock2.hide();
} else { } else {
if (model.hasSelected) { if (model.hasSelected) {
this.startAnimate() if (this.style.SignalButton && this.style.SignalButton.selectColor) {
this.rectButton && this.rectButton.setStyle({fill:this.style.SignalButton.selectColor});
} else {
this.startAnimate(this.getTypeColor());
}
} else if (model.toSelected) {
this.startAnimate(this.style.SignalButton.flashingColor);
} }
} }
} }
pressDown(flg, color) { pressDown(flg, color) {
if (this.pressed === flg) return if (this.pressed === flg) return;
if (this.arcShapeDock1) { if (this.arcShapeDock1) {
if (flg) { if (flg) {
this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy + 2 }, z: this.z + 2, zlevel: this.zlevel }) this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy + 2 }, z: this.z + 2, zlevel: this.zlevel });
if (color) { if (color) {
this.arcShape this.arcShape
.animateStyle(true) .animateStyle(true)
.when(0, { fill: '#69666E' }) .when(0, { fill: '#69666E' })
.when(1000, { fill: color }) .when(1000, { fill: color })
.when(2000, { fill: '#69666E' }) .when(2000, { fill: '#69666E' })
.start() .start();
} }
} else { } else {
this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy - 2 }, z: this.z + 2, zlevel: this.zlevel }) this.arcShape.attr({ shape: { cy: this.arcShape.shape.cy - 2 }, z: this.z + 2, zlevel: this.zlevel });
this.arcShape.stopAnimation(true) this.arcShape.stopAnimation(true);
this.recover() this.recover();
} }
this.pressed = flg this.pressed = flg;
} }
} }
getAnchorPoint() {} getAnchorPoint() {}