diff --git a/src/components/line-app/states/TurnoutState.vue b/src/components/line-app/states/TurnoutState.vue index 248f660..a4bc8eb 100644 --- a/src/components/line-app/states/TurnoutState.vue +++ b/src/components/line-app/states/TurnoutState.vue @@ -28,19 +28,12 @@ label="id" hint="" /> - +
@@ -48,7 +41,23 @@ + +
+ +
+
+
@@ -56,22 +65,19 @@ diff --git a/src/graphics/turnout/Turnout.ts b/src/graphics/turnout/Turnout.ts index 95fad1e..cff2e31 100644 --- a/src/graphics/turnout/Turnout.ts +++ b/src/graphics/turnout/Turnout.ts @@ -196,11 +196,11 @@ export class Turnout extends JlGraphic { doRepaint(): void { // console.log(this.states); const { pointB, pointC } = this.datas; - if (this.states.normal) { + if (this.states.dw) { this.graphics.fork.paint(pointB[0]); this.graphics.label.style.stroke = TurnoutConsts.normalLabelColor; this.graphics.fork.visible = true; - } else if (this.states.reverse) { + } else if (this.states.fw) { this.graphics.fork.paint(pointC[0]); this.graphics.label.style.stroke = TurnoutConsts.reverseLabelColor; this.graphics.fork.visible = true; diff --git a/src/protos/request.ts b/src/protos/request.ts index 87c51db..9cd1027 100644 --- a/src/protos/request.ts +++ b/src/protos/request.ts @@ -55,7 +55,10 @@ export namespace request { SetSB = 5, CancelSB = 6, SetJC = 7, - CancelJC = 8 + CancelJC = 8, + ForceDw = 9, + ForceFw = 10, + CancelForce = 11 } } export class TurnoutOperationReq extends pb_1.Message { @@ -293,9 +296,11 @@ export namespace request { export namespace Section { export enum AxleOperation { Drst = 0, - Pdrst = 1, - TrainIn = 2, - TrainOut = 3 + Pdrst = 1 + } + export enum SectionOperation { + SetFaultOcc = 0, + CancelFaultOcc = 1 } } }