From 5f622454ff8d24e5c29dc3320bd17d568181b9a7 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 16:44:39 +0800
Subject: [PATCH 01/22] =?UTF-8?q?psl=E6=B5=81=E7=A8=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Simulation.ts                        |  13 +++
 src/drawApp/graphics/GatedBoxInteraction.ts  |  12 +-
 src/drawApp/graphics/PslButtonInteraction.ts |  98 +++++++++++++++--
 src/drawApp/pslScene.ts                      |  50 +++++----
 src/graphics/pslButton/pslButton.ts          |   6 +-
 src/layouts/LineLayout.vue                   |  92 ++++++----------
 src/stores/line-store.ts                     |   9 --
 src/stores/psl-store.ts                      | 109 +++----------------
 8 files changed, 200 insertions(+), 189 deletions(-)

diff --git a/src/api/Simulation.ts b/src/api/Simulation.ts
index 1801ac9..74612b6 100644
--- a/src/api/Simulation.ts
+++ b/src/api/Simulation.ts
@@ -135,3 +135,16 @@ export async function setRelayState(data: {
 }) {
   return await api.post(`${UriBase}/relay/operation`, data);
 }
+
+/**
+ * PSL操作
+ */
+export async function pslOperate(data: {
+  simulationId: string;
+  mapId: number;
+  gateBoxId: string;
+  buttonCode: string;
+  down: boolean;
+}) {
+  return await api.post(`${UriBase}/psl/operation`, data);
+}
diff --git a/src/drawApp/graphics/GatedBoxInteraction.ts b/src/drawApp/graphics/GatedBoxInteraction.ts
index bad8458..21f37ee 100644
--- a/src/drawApp/graphics/GatedBoxInteraction.ts
+++ b/src/drawApp/graphics/GatedBoxInteraction.ts
@@ -11,8 +11,8 @@ import { ContextMenu } from 'src/jl-graphic/ui/ContextMenu';
 import { MenuItemOptions } from 'src/jl-graphic/ui/Menu';
 
 import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { useLineStore } from 'src/stores/line-store';
 import { GraphicDataBase } from './GraphicDataBase';
+import { usePslStore } from 'src/stores/psl-store';
 
 export class GatedBoxData extends GraphicDataBase implements IGatedBox {
   constructor(data?: graphicData.GatedBox) {
@@ -141,8 +141,12 @@ export class GatedBoxOperateInteraction extends GraphicInteractionPlugin<GatedBo
     g.eventMode = 'none';
     g.off('_leftclick', this.onLeftClick, this);
   }
-  onLeftClick() {
-    // useLineStore().stateProCountIncrease();
-    useLineStore().increaseGatedBoxCount();
+  onLeftClick(e: FederatedMouseEvent) {
+    const target = e.target as DisplayObject;
+    const gatedBox = target.getGraphic() as GatedBox;
+    usePslStore().setPslParam(
+      gatedBox.datas.id,
+      gatedBox.datas.refGatedBoxMapCode
+    );
   }
 }
diff --git a/src/drawApp/graphics/PslButtonInteraction.ts b/src/drawApp/graphics/PslButtonInteraction.ts
index f81d262..4e7affd 100644
--- a/src/drawApp/graphics/PslButtonInteraction.ts
+++ b/src/drawApp/graphics/PslButtonInteraction.ts
@@ -1,12 +1,22 @@
 import * as pb_1 from 'google-protobuf';
-import { IPslButtonData, PslButton } from 'src/graphics/pslButton/pslButton';
+import {
+  IPslButtonData,
+  IPslButtonState,
+  PslButton,
+} from 'src/graphics/pslButton/pslButton';
 import {
   GraphicInteractionPlugin,
   IGraphicScene,
   JlGraphic,
 } from 'src/jl-graphic';
 import { pslGraphicData } from 'src/protos/pslGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
+import { GraphicDataBase, GraphicStateBase } from './GraphicDataBase';
+import { pslOperate } from 'src/api/Simulation';
+import { useLineStore } from 'src/stores/line-store';
+import { DisplayObject, FederatedMouseEvent } from 'pixi.js';
+import { errorNotify } from 'src/utils/CommonNotify';
+import { usePslStore } from 'src/stores/psl-store';
+import { state } from 'src/protos/device_state';
 
 export class PslButtonData extends GraphicDataBase implements IPslButtonData {
   constructor(data?: pslGraphicData.PslButton) {
@@ -53,6 +63,43 @@ export class PslButtonData extends GraphicDataBase implements IPslButtonData {
     return pb_1.Message.equals(this.data, other.data);
   }
 }
+//GraphicStateBase
+export class PslButtonState
+  extends GraphicStateBase
+  implements IPslButtonState
+{
+  constructor(proto?: state.ButtonState) {
+    let states;
+    if (proto) {
+      states = proto;
+    } else {
+      states = new state.ButtonState();
+    }
+    super(states, PslButton.Type);
+  }
+  get code(): string {
+    return this.states.id;
+  }
+  get down(): boolean {
+    return this.states.down;
+  }
+  set down(v: boolean) {
+    this.states.down = v;
+  }
+  get states(): state.ButtonState {
+    return this.getState<state.ButtonState>();
+  }
+  clone(): PslButtonState {
+    return new PslButtonState(this.states.cloneMessage());
+  }
+  copyFrom(data: GraphicStateBase): void {
+    pb_1.Message.copyInto(data._state, this._state);
+  }
+  eq(data: GraphicStateBase): boolean {
+    return pb_1.Message.equals(this._state, data._state);
+  }
+}
+
 export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslButton> {
   static Name = 'psl_button_operate_menu';
   constructor(app: IGraphicScene) {
@@ -70,16 +117,53 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
     g.eventMode = 'static';
     g.cursor = 'pointer';
     g.selectable = true;
-    g.on('_leftclick', this.onLeftClick, this);
+    g.on('mousedown', this.onMouseDown, this);
+    g.on('mouseup', this.onMouseUp, this);
   }
 
   unbind(g: PslButton): void {
     g.selectable = false;
     g.eventMode = 'none';
-    g.off('_leftclick', this.onLeftClick, this);
+    g.off('mousedown', this.onMouseDown, this);
+    g.on('mouseup', this.onMouseUp, this);
   }
-  onLeftClick() {
-    // useLineStore().stateProCountIncrease();
-    // useLineStore().increaseGatedBoxCount();
+  //FederatedMouseEvent
+  onMouseDown(e: FederatedMouseEvent) {
+    const simulationId = useLineStore().simulationId;
+    const mapId = useLineStore().mapId;
+    const gateBoxId = usePslStore().gatedBoxId;
+    const target = e.target as DisplayObject;
+    const pslButton = target.getGraphic() as PslButton;
+    if (!simulationId || !mapId) {
+      return;
+    }
+    pslOperate({
+      simulationId,
+      mapId,
+      buttonCode: pslButton.datas.code,
+      gateBoxId: gateBoxId,
+      down: true,
+    }).catch((err) => {
+      errorNotify('操作失败', { message: err.origin.response.data.title });
+    });
+  }
+  onMouseUp(e: FederatedMouseEvent) {
+    const simulationId = useLineStore().simulationId;
+    const mapId = useLineStore().mapId;
+    const gateBoxId = usePslStore().gatedBoxId;
+    const target = e.target as DisplayObject;
+    const pslButton = target.getGraphic() as PslButton;
+    if (!simulationId || !mapId) {
+      return;
+    }
+    pslOperate({
+      simulationId,
+      mapId,
+      buttonCode: pslButton.datas.code,
+      gateBoxId: gateBoxId,
+      down: false,
+    }).catch((err) => {
+      errorNotify('操作失败', { message: err.origin.response.data.title });
+    });
   }
 }
diff --git a/src/drawApp/pslScene.ts b/src/drawApp/pslScene.ts
index 47d0bcc..79b85b3 100644
--- a/src/drawApp/pslScene.ts
+++ b/src/drawApp/pslScene.ts
@@ -5,7 +5,7 @@ import {
   IGraphicScene,
   IGraphicStorage,
 } from 'src/jl-graphic';
-import { getPublishMapInfoByLineId } from 'src/api/PublishApi';
+import { getPublishMapInfoByName } from 'src/api/PublishApi';
 import { usePslStore } from 'src/stores/psl-store';
 import { toUint8Array } from 'js-base64';
 import { PslKeyTemplate } from 'src/graphics/pslKey/pslKey';
@@ -14,6 +14,7 @@ import { PslButtonTemplate } from 'src/graphics/pslButton/pslButton';
 import {
   PslButtonData,
   PslButtonOperateInteraction,
+  PslButtonState,
 } from './graphics/PslButtonInteraction';
 import { PslLightTemplate } from 'src/graphics/pslLight/pslLight';
 import { PslLightData } from './graphics/PslLightInteraction';
@@ -21,6 +22,7 @@ import { pslGraphicData } from 'src/protos/pslGraphics';
 import { PslTextData } from './graphics/TextContentInteraction';
 import { TextContentTemplate } from 'src/graphics/textContent/TextContent';
 import { useLineStore } from 'src/stores/line-store';
+import { state } from 'src/protos/device_state';
 
 export function initPslScene(lineApp: IGraphicApp, sceneName: string) {
   // psl
@@ -28,8 +30,8 @@ export function initPslScene(lineApp: IGraphicApp, sceneName: string) {
     dataLoader: loadPslDatas,
     mouseToolOptions: {
       boxSelect: false,
-      viewportDrag: true,
-      wheelZoom: true,
+      viewportDrag: false,
+      wheelZoom: false,
     },
   });
   const graphicTemplate = [
@@ -43,28 +45,38 @@ export function initPslScene(lineApp: IGraphicApp, sceneName: string) {
   pslScene.on('postdataloaded', () => {
     handleSubscribe(pslScene);
   });
-  pslScene.setOptions({
-    mouseToolOptions: {
-      boxSelect: false,
-      viewportDrag: false,
-      wheelZoom: false,
-    },
-  });
-  return lineApp;
+  // pslScene.setOptions({
+  //   mouseToolOptions: {
+  //     boxSelect: false,
+  //     viewportDrag: false,
+  //     wheelZoom: false,
+  //   },
+  // });
+  return pslScene;
 }
 
 function handleSubscribe(pslScene: IGraphicScene) {
   const lineStore = useLineStore();
+  const pslStore = usePslStore();
   const simulationId = lineStore.simulationId;
   const mapId = lineStore.mapId;
-  const pslId = lineStore.pslId;
+  const pslId = pslStore.gatedBoxId;
   const app = pslScene;
   app.subscribe({
     destination: `simulation-psl-${simulationId}_${mapId}_${pslId}-status`,
     messageConverter: (message: Uint8Array) => {
-      // console.log('收到消息', message);
+      console.log('收到消息', message);
       const states: GraphicState[] = [];
-      // const storage = state.PushedDevicesStatus.deserialize(message);
+      const storage = state.PushedDevicesStatus.deserialize(message);
+      if (storage.all) {
+        storage.allStatus.buttonState.forEach((item) => {
+          // 道岔
+          if (item.id) {
+            states.push(new PslButtonState(item));
+          }
+        });
+      }
+      console.log(states, 'states');
       return states;
     },
   });
@@ -72,12 +84,10 @@ function handleSubscribe(pslScene: IGraphicScene) {
 
 async function loadPslDatas(): Promise<IGraphicStorage> {
   const pslStore = usePslStore();
-  const mapId = pslStore.mapId;
-  const simulationId = pslStore.simulationId;
-  if (!mapId || !simulationId) {
-    throw new Error('获取数据异常：未获取到地图ID或仿真ID');
-  }
-  const { proto: base64 } = await getPublishMapInfoByLineId(mapId + '');
+  const { proto: base64 } = await getPublishMapInfoByName({
+    name: pslStore.pslMapCode,
+    detail: true,
+  });
   if (base64) {
     const storage = pslGraphicData.PslGraphicStorage.deserialize(
       toUint8Array(base64)
diff --git a/src/graphics/pslButton/pslButton.ts b/src/graphics/pslButton/pslButton.ts
index 8684211..34e368c 100644
--- a/src/graphics/pslButton/pslButton.ts
+++ b/src/graphics/pslButton/pslButton.ts
@@ -27,8 +27,10 @@ export interface IPslButtonData extends GraphicData {
 }
 
 export interface IPslButtonState extends GraphicState {
-  get state(): number;
-  set state(v: number);
+  get code(): string;
+  set code(v: string);
+  get down(): boolean;
+  set down(v: boolean);
 }
 
 export class PslButton extends JlGraphic {
diff --git a/src/layouts/LineLayout.vue b/src/layouts/LineLayout.vue
index b59d43c..f203887 100644
--- a/src/layouts/LineLayout.vue
+++ b/src/layouts/LineLayout.vue
@@ -37,11 +37,18 @@
     <q-page-container>
       <div id="line-app-container" class="overflow-hidden"></div>
     </q-page-container>
-    <q-dialog v-model="pslDialog" @before-hide="pslHide">
-      <q-page-container>
-        <div id="psl-app-container" class="overflow-hidden"></div>
-      </q-page-container>
-    </q-dialog>
+    <draggable-dialog
+      v-model="pslStore.isPslDialogOpen"
+      :width="pslCanvasWidth"
+      :height="pslCanvasHeight"
+      @hide="pslHide"
+    >
+      <div
+        id="psl-app-container"
+        class="overflow-hidden"
+        style="width: 500px; height: 600px"
+      ></div>
+    </draggable-dialog>
     <DraggableDialog
       :title="`${ibpStore.stationCode}IBP`"
       v-model="ibpStore.isIbpDialogOpen"
@@ -83,8 +90,6 @@ import { ISceneName, getSceneName } from 'src/drawApp/lineApp';
 import { useTestManageStore } from 'src/stores/testManage-store';
 import { CategoryType } from 'src/components/CategoryType';
 import TrainInfoEcharts from 'src/components/line-app/infos/TrainInfoEcharts.vue';
-import { GatedBox } from 'src/graphics/gatedBox/GatedBox';
-import { getPublishMapInfoByName } from 'src/api/PublishApi';
 import { useIbpStore } from 'src/stores/ibp-store';
 
 const $q = useQuasar();
@@ -95,8 +100,8 @@ const route = useRoute();
 const router = useRouter();
 const lineStore = useLineStore();
 const ibpStore = useIbpStore();
+const pslStore = usePslStore();
 const testManageStore = useTestManageStore();
-const pslDialog = ref(false);
 const simulationId = (route.query.simulationId as string) || '';
 const projectId = (route.query.projectId as string) || '';
 const defaultMapId = (route.query.defaultMapId as string) || '';
@@ -186,9 +191,6 @@ onMounted(async () => {
     lineStore.setSimulationId(null);
   }
   drawerRight.value = false;
-  // setTimeout(() => {
-  //   pslShow();
-  // }, 5000);
 });
 onUnmounted(() => {
   if (dialogInstance.value && lineStore.showLayerDialog) {
@@ -215,16 +217,34 @@ watch(
   }
 );
 
+const pslCanvasWidth = ref(500);
+const pslCanvasHeight = ref(600);
 watch(
-  () => lineStore.gatedBoxCount,
-  () => {
-    if (lineStore.selectedGraphics) {
-      const gatedBox = lineStore.selectedGraphics[0] as GatedBox;
-      pslShow(gatedBox);
+  () => pslStore.isPslDialogOpen,
+  (val: boolean) => {
+    if (val === true) {
+      nextTick(async () => {
+        const container = document.getElementById('psl-app-container');
+        if (!container) return;
+        const pslScene = pslStore.getPslScene();
+        pslScene?.bindDom(container);
+        await pslScene?.reload();
+        if (pslScene) {
+          pslCanvasWidth.value = pslScene.canvas.width;
+          pslCanvasHeight.value = pslScene.canvas.height;
+          container.style.width = pslCanvasWidth.value + 'px';
+          container.style.height = pslCanvasHeight.value + 'px';
+        }
+      });
     }
   }
 );
 
+function pslHide() {
+  pslStore.clearPslParam();
+  lineApp.getScene('psl').destroy();
+}
+
 const dialogInstance = ref();
 
 watch(
@@ -301,46 +321,6 @@ function switchScene(val: MapInfo) {
   }
 }
 
-function pslShow(gatedBox: GatedBox) {
-  pslDialog.value = true;
-  const pslApp = usePslStore().initLineApp();
-  if (gatedBox.datas.refGatedBoxMapCode) {
-    const params = {
-      name: gatedBox.datas.refGatedBoxMapCode,
-      detail: false,
-    };
-    lineStore.setPslId(gatedBox.datas.id);
-    getPublishMapInfoByName(params).then(async (mapInfo) => {
-      const dom = document.getElementById('psl-app-container');
-      if (dom) {
-        usePslStore().addAllScene([mapInfo]);
-        usePslStore().setMapId(mapInfo.id);
-        usePslStore().setSimulationId(simulationId);
-        sceneName = getSceneNameFn(mapInfo);
-        usePslStore().setSceneName(sceneName);
-        scene = pslApp.getScene(sceneName);
-        scene.bindDom(dom);
-        await scene.reload();
-        dom.style.width = scene.canvas.width + 'px';
-        dom.style.height = scene.canvas.height + 'px';
-      }
-    });
-  } else {
-    $q.notify({
-      type: 'negative',
-      message: '未获取到关联门控箱地图数据',
-    });
-  }
-}
-
-function pslHide() {
-  const pslApp = usePslStore().initLineApp();
-  lineStore.setPslId('');
-  pslApp.unbindDom();
-  pslApp.destroy();
-  pslDialog.value = false;
-}
-
 watch(
   () => ibpStore.isIbpDialogOpen,
   (val) => {
diff --git a/src/stores/line-store.ts b/src/stores/line-store.ts
index 9dbad96..f776f77 100644
--- a/src/stores/line-store.ts
+++ b/src/stores/line-store.ts
@@ -33,8 +33,6 @@ export const useLineStore = defineStore('line', {
     categoryType: null as CategoryType | null,
     echartsTrainId: '',
     trainStateMap: new Map() as Map<Date, TrainState[]>,
-    gatedBoxCount: 0,
-    pslId: '',
   }),
   getters: {
     selectedGraphicType: (state) => {
@@ -64,7 +62,6 @@ export const useLineStore = defineStore('line', {
         );
       });
       this.selectedGraphics = [];
-      this.gatedBoxCount = 0;
       return app;
     },
     addAllScene(list: MapInfo[]) {
@@ -135,11 +132,5 @@ export const useLineStore = defineStore('line', {
     setCategoryType(type: CategoryType | null) {
       this.categoryType = type;
     },
-    increaseGatedBoxCount() {
-      this.gatedBoxCount++;
-    },
-    setPslId(id: string) {
-      this.pslId = id;
-    },
   },
 });
diff --git a/src/stores/psl-store.ts b/src/stores/psl-store.ts
index 045ea49..e8d3a57 100644
--- a/src/stores/psl-store.ts
+++ b/src/stores/psl-store.ts
@@ -1,102 +1,29 @@
 import { defineStore } from 'pinia';
-import {
-  IJlCanvas,
-  JlGraphic,
-  IGraphicApp,
-  GraphicState,
-} from 'src/jl-graphic';
-import {
-  initLineApp,
-  getLineApp,
-  destroyLineApp,
-  addSceneList,
-  ISceneName,
-} from 'src/drawApp/lineApp';
-import { markRaw } from 'vue';
-import { MapInfo } from 'src/api/ProjectLinkApi';
+import { initPslScene } from 'src/drawApp/pslScene';
+import { getLineApp } from 'src/drawApp/lineApp';
 
 export const usePslStore = defineStore('psl', {
   state: () => ({
-    selectedGraphics: null as JlGraphic[] | null,
-    lineId: null as number | null,
-    lineName: null as string | null,
-    simulationId: null as string | null,
-    socketStates: null as GraphicState[] | null,
-    stateProCount: 0,
-    showLayer: [] as string[], // 显示的图层（草稿和发布图公用）
-    showLayerDialog: false, // 显示图层控制弹窗（草稿和发布图公用）
-    mapId: null as number | null,
-    sceneName: '', // 场景名称
+    pslMapCode: '',
+    gatedBoxId: '',
+    isPslDialogOpen: false,
   }),
-  getters: {
-    selectedGraphicType: (state) => {
-      if (state.selectedGraphics) {
-        if (state.selectedGraphics.length === 1) {
-          return state.selectedGraphics[0].type;
-        }
-      }
-    },
-  },
   actions: {
-    getLineApp(): IGraphicApp {
-      const app = getLineApp();
-      if (app == null) {
-        throw new Error('未初始化app');
-      }
-      return app;
+    getPslScene() {
+      const lineApp = getLineApp();
+      if (!lineApp) return;
+      const pslScene = initPslScene(lineApp, 'psl');
+      return pslScene;
     },
-    getJlCanvas(): IJlCanvas {
-      return this.getLineApp().canvas;
+    setPslParam(gatedBoxId: string, pslMapCode: string) {
+      this.gatedBoxId = gatedBoxId;
+      this.pslMapCode = pslMapCode;
+      this.isPslDialogOpen = true;
     },
-    initLineApp() {
-      const app = initLineApp();
-      app.on('graphicselected', () => {
-        this.selectedGraphics = markRaw(
-          app.getScene(this.sceneName).selectedGraphics
-        );
-      });
-      this.selectedGraphics = [];
-      return app;
-    },
-    addAllScene(list: MapInfo[]) {
-      const arr: ISceneName[] = list.map((item) => {
-        return { type: item.type, id: item.id };
-      });
-      addSceneList(arr);
-    },
-    appCurrentScene() {
-      return this.getLineApp().getScene(this.sceneName);
-    },
-    destroy() {
-      this.selectedGraphics = null;
-      destroyLineApp();
-    },
-    setLineId(id: number | null) {
-      this.lineId = id;
-    },
-    setLineName(name: string | null) {
-      this.lineName = name;
-    },
-    setSimulationId(id: string | null) {
-      this.simulationId = id;
-    },
-    setSocketStates(v: GraphicState[] | null) {
-      this.socketStates = v;
-    },
-    stateProCountIncrease() {
-      this.stateProCount++;
-    },
-    setShowLayer(v: string[]) {
-      this.showLayer = v;
-    },
-    setShowLayerDialog(v: boolean) {
-      this.showLayerDialog = v;
-    },
-    setMapId(id: number | null) {
-      this.mapId = id;
-    },
-    setSceneName(sceneName: string) {
-      this.sceneName = sceneName;
+    clearPslParam() {
+      this.gatedBoxId = '';
+      this.pslMapCode = '';
+      this.isPslDialogOpen = false;
     },
   },
 });

From a42a3e79c7078b473893aea0081bcd8278c8756c Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 16:52:41 +0800
Subject: [PATCH 02/22] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message                            |  2 +-
 graphic-pixi                               |  2 +-
 src/drawApp/pslScene.ts                    | 20 ++++++++++----------
 src/jl-graphic/plugins/AnimationManager.ts |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index 4ea207e..cff3d23 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 4ea207ebba3bce4ff022de42d8fbd5235f172a81
+Subproject commit cff3d23475a6352e560e27f7b006727b3b884217
diff --git a/graphic-pixi b/graphic-pixi
index 023c84c..8550a45 160000
--- a/graphic-pixi
+++ b/graphic-pixi
@@ -1 +1 @@
-Subproject commit 023c84c4ccf7f38e477253e1b49856bfb50aca18
+Subproject commit 8550a458fccb2171a7b0889c9853f4716a48823d
diff --git a/src/drawApp/pslScene.ts b/src/drawApp/pslScene.ts
index 79b85b3..70e2123 100644
--- a/src/drawApp/pslScene.ts
+++ b/src/drawApp/pslScene.ts
@@ -67,16 +67,16 @@ function handleSubscribe(pslScene: IGraphicScene) {
     messageConverter: (message: Uint8Array) => {
       console.log('收到消息', message);
       const states: GraphicState[] = [];
-      const storage = state.PushedDevicesStatus.deserialize(message);
-      if (storage.all) {
-        storage.allStatus.buttonState.forEach((item) => {
-          // 道岔
-          if (item.id) {
-            states.push(new PslButtonState(item));
-          }
-        });
-      }
-      console.log(states, 'states');
+      // const storage = state.PushedDevicesStatus.deserialize(message);
+      // if (storage.all) {
+      //   storage.allStatus.buttonState.forEach((item) => {
+      //     // 道岔
+      //     if (item.id) {
+      //       states.push(new PslButtonState(item));
+      //     }
+      //   });
+      // }
+      // console.log(states, 'states');
       return states;
     },
   });
diff --git a/src/jl-graphic/plugins/AnimationManager.ts b/src/jl-graphic/plugins/AnimationManager.ts
index d783098..fe88038 100644
--- a/src/jl-graphic/plugins/AnimationManager.ts
+++ b/src/jl-graphic/plugins/AnimationManager.ts
@@ -42,7 +42,7 @@ export class AnimationManager {
   }
 
   destroy() {
-    this.app.pixi.ticker.remove(this.run, this);
+    this.app.pixi?.ticker.remove(this.run, this);
   }
   /**
    * 图形对象的所有动画map

From e08dfdefc1eee8ba54d86d2a7a4d3e6f64b8a954 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 17:00:31 +0800
Subject: [PATCH 03/22] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 graphic-pixi                               | 2 +-
 src/jl-graphic/plugins/AnimationManager.ts | 2 +-
 src/layouts/LineLayout.vue                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphic-pixi b/graphic-pixi
index 8550a45..4327e3c 160000
--- a/graphic-pixi
+++ b/graphic-pixi
@@ -1 +1 @@
-Subproject commit 8550a458fccb2171a7b0889c9853f4716a48823d
+Subproject commit 4327e3c282182b2a1de2d28046f08c24750a3e95
diff --git a/src/jl-graphic/plugins/AnimationManager.ts b/src/jl-graphic/plugins/AnimationManager.ts
index fe88038..d783098 100644
--- a/src/jl-graphic/plugins/AnimationManager.ts
+++ b/src/jl-graphic/plugins/AnimationManager.ts
@@ -42,7 +42,7 @@ export class AnimationManager {
   }
 
   destroy() {
-    this.app.pixi?.ticker.remove(this.run, this);
+    this.app.pixi.ticker.remove(this.run, this);
   }
   /**
    * 图形对象的所有动画map
diff --git a/src/layouts/LineLayout.vue b/src/layouts/LineLayout.vue
index ede820e..d09ceb8 100644
--- a/src/layouts/LineLayout.vue
+++ b/src/layouts/LineLayout.vue
@@ -242,7 +242,7 @@ watch(
 
 function pslHide() {
   pslStore.clearPslParam();
-  lineApp.getScene('psl').destroy();
+  lineApp.getScene('psl').unbindDom();
 }
 
 const dialogInstance = ref();

From 6c9c3f9a403dce5164d4f4aa7da43b6a58acdbf0 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 19 Oct 2023 17:26:56 +0800
Subject: [PATCH 04/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E4=B8=BB=E5=9D=90=E6=A0=87=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DrawLayout.vue          |  8 ++++
 src/protos/stationLayoutGraphics.ts | 57 +++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index 3a151b3..7a85343 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -152,6 +152,14 @@
             v-model="UniqueIdPrefix.lineId"
             :rules="[(val) => val.trim() != '' || '集中站名称不能为空']"
           />
+          <q-input
+            outlined
+            label="地图的公里标主坐标系"
+            v-model="UniqueIdPrefix.mainCoordinateSystem"
+            :rules="[
+              (val) => val.trim() != '' || '地图的公里标主坐标系不能为空',
+            ]"
+          />
         </q-card-section>
 
         <q-card-actions align="right">
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index e91ba43..a3e538e 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -2798,6 +2798,7 @@ export namespace graphicData {
             index?: number;
             refDev?: RelatedRef;
             centralizedStations?: string[];
+            mt?: Signal.ModelType;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [9], this.#one_of_decls);
@@ -2823,6 +2824,9 @@ export namespace graphicData {
                 if ("centralizedStations" in data && data.centralizedStations != undefined) {
                     this.centralizedStations = data.centralizedStations;
                 }
+                if ("mt" in data && data.mt != undefined) {
+                    this.mt = data.mt;
+                }
             }
         }
         get common() {
@@ -2876,6 +2880,12 @@ export namespace graphicData {
         set centralizedStations(value: string[]) {
             pb_1.Message.setField(this, 9, value);
         }
+        get mt() {
+            return pb_1.Message.getFieldWithDefault(this, 10, Signal.ModelType.N) as Signal.ModelType;
+        }
+        set mt(value: Signal.ModelType) {
+            pb_1.Message.setField(this, 10, value);
+        }
         static fromObject(data: {
             common?: ReturnType<typeof CommonInfo.prototype.toObject>;
             code?: string;
@@ -2884,6 +2894,7 @@ export namespace graphicData {
             index?: number;
             refDev?: ReturnType<typeof RelatedRef.prototype.toObject>;
             centralizedStations?: string[];
+            mt?: Signal.ModelType;
         }): Signal {
             const message = new Signal({});
             if (data.common != null) {
@@ -2907,6 +2918,9 @@ export namespace graphicData {
             if (data.centralizedStations != null) {
                 message.centralizedStations = data.centralizedStations;
             }
+            if (data.mt != null) {
+                message.mt = data.mt;
+            }
             return message;
         }
         toObject() {
@@ -2918,6 +2932,7 @@ export namespace graphicData {
                 index?: number;
                 refDev?: ReturnType<typeof RelatedRef.prototype.toObject>;
                 centralizedStations?: string[];
+                mt?: Signal.ModelType;
             } = {};
             if (this.common != null) {
                 data.common = this.common.toObject();
@@ -2940,6 +2955,9 @@ export namespace graphicData {
             if (this.centralizedStations != null) {
                 data.centralizedStations = this.centralizedStations;
             }
+            if (this.mt != null) {
+                data.mt = this.mt;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -2960,6 +2978,8 @@ export namespace graphicData {
                 writer.writeMessage(8, this.refDev, () => this.refDev.serialize(writer));
             if (this.centralizedStations.length)
                 writer.writeRepeatedString(9, this.centralizedStations);
+            if (this.mt != Signal.ModelType.N)
+                writer.writeEnum(10, this.mt);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2990,6 +3010,9 @@ export namespace graphicData {
                     case 9:
                         pb_1.Message.addToRepeatedField(message, 9, reader.readString());
                         break;
+                    case 10:
+                        message.mt = reader.readEnum();
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -3002,6 +3025,17 @@ export namespace graphicData {
             return Signal.deserialize(bytes);
         }
     }
+    export namespace Signal {
+        export enum ModelType {
+            N = 0,
+            HL = 1,
+            HLU_FU = 2,
+            HLU = 3,
+            HLU_FL = 4,
+            AB = 5,
+            HBU = 6
+        }
+    }
     export class Section extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -6644,6 +6678,7 @@ export namespace graphicData {
         constructor(data?: any[] | {
             city?: string;
             lineId?: string;
+            mainCoordinateSystem?: string;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -6654,6 +6689,9 @@ export namespace graphicData {
                 if ("lineId" in data && data.lineId != undefined) {
                     this.lineId = data.lineId;
                 }
+                if ("mainCoordinateSystem" in data && data.mainCoordinateSystem != undefined) {
+                    this.mainCoordinateSystem = data.mainCoordinateSystem;
+                }
             }
         }
         get city() {
@@ -6668,9 +6706,16 @@ export namespace graphicData {
         set lineId(value: string) {
             pb_1.Message.setField(this, 2, value);
         }
+        get mainCoordinateSystem() {
+            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
+        }
+        set mainCoordinateSystem(value: string) {
+            pb_1.Message.setField(this, 3, value);
+        }
         static fromObject(data: {
             city?: string;
             lineId?: string;
+            mainCoordinateSystem?: string;
         }): UniqueIdOfStationLayout {
             const message = new UniqueIdOfStationLayout({});
             if (data.city != null) {
@@ -6679,12 +6724,16 @@ export namespace graphicData {
             if (data.lineId != null) {
                 message.lineId = data.lineId;
             }
+            if (data.mainCoordinateSystem != null) {
+                message.mainCoordinateSystem = data.mainCoordinateSystem;
+            }
             return message;
         }
         toObject() {
             const data: {
                 city?: string;
                 lineId?: string;
+                mainCoordinateSystem?: string;
             } = {};
             if (this.city != null) {
                 data.city = this.city;
@@ -6692,6 +6741,9 @@ export namespace graphicData {
             if (this.lineId != null) {
                 data.lineId = this.lineId;
             }
+            if (this.mainCoordinateSystem != null) {
+                data.mainCoordinateSystem = this.mainCoordinateSystem;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -6702,6 +6754,8 @@ export namespace graphicData {
                 writer.writeString(1, this.city);
             if (this.lineId.length)
                 writer.writeString(2, this.lineId);
+            if (this.mainCoordinateSystem.length)
+                writer.writeString(3, this.mainCoordinateSystem);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -6717,6 +6771,9 @@ export namespace graphicData {
                     case 2:
                         message.lineId = reader.readString();
                         break;
+                    case 3:
+                        message.mainCoordinateSystem = reader.readString();
+                        break;
                     default: reader.skipField();
                 }
             }

From b82039db7e4d233dbe52ea955b28f186e9af650b Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 17:30:46 +0800
Subject: [PATCH 05/22] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=95=85?=
 =?UTF-8?q?=E9=9A=9C=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Simulation.ts                         |   1 +
 .../line-app/states/SignalState.vue           | 125 +++++++++++++++++-
 src/drawApp/graphics/SignalInteraction.ts     |   6 +
 3 files changed, 127 insertions(+), 5 deletions(-)

diff --git a/src/api/Simulation.ts b/src/api/Simulation.ts
index 74612b6..885fa43 100644
--- a/src/api/Simulation.ts
+++ b/src/api/Simulation.ts
@@ -60,6 +60,7 @@ export async function setSignalState(data: {
   simulationId: string;
   mapId: number;
   id: string;
+  operation: number;
   aspect: number;
 }) {
   return await api.post(`${UriBase}/signal/operation`, data);
diff --git a/src/components/line-app/states/SignalState.vue b/src/components/line-app/states/SignalState.vue
index 85851bb..181247d 100644
--- a/src/components/line-app/states/SignalState.vue
+++ b/src/components/line-app/states/SignalState.vue
@@ -1,7 +1,22 @@
 <template>
   <q-card flat bordered>
-    <q-card-section>
+    <q-card-section class="flex justify-between">
       <div class="text-h6">信号机状态</div>
+      <q-btn-dropdown color="primary" label="操作">
+        <q-list>
+          <q-item
+            v-for="(item, index) in options"
+            :key="index"
+            clickable
+            v-close-popup
+            @click="doSignalOperation(item)"
+          >
+            <q-item-section>
+              <q-item-label>{{ item.label }}</q-item-label>
+            </q-item-section>
+          </q-item>
+        </q-list>
+      </q-btn-dropdown>
     </q-card-section>
     <q-separator inset />
     <q-form>
@@ -37,15 +52,99 @@
 import { useLineStore } from 'src/stores/line-store';
 import { ref, watch, onMounted } from 'vue';
 import { Signal } from 'src/graphics/signal/Signal';
+import { request } from 'src/protos/request';
+import { state } from 'src/protos/device_state';
+import { setSignalState } from 'src/api/Simulation';
+import { errorNotify } from 'src/utils/CommonNotify';
 
 const lineStore = useLineStore();
 const signalState = ref({ id: '', index: 0, code: '' });
 
+const options = [
+  {
+    label: '开红灯',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.Display,
+    },
+  },
+  {
+    label: '开绿灯',
+    value: {
+      aspect: state.Signal.Aspect.L,
+      operation: request.Signal.Operation.Display,
+    },
+  },
+  {
+    label: '开黄灯',
+    value: {
+      aspect: state.Signal.Aspect.U,
+      operation: request.Signal.Operation.Display,
+    },
+  },
+  {
+    label: '开引导',
+    value: {
+      aspect: state.Signal.Aspect.HU,
+      operation: request.Signal.Operation.Display,
+    },
+  },
+  {
+    label: '关灯',
+    value: {
+      aspect: state.Signal.Aspect.OFF,
+      operation: request.Signal.Operation.Display,
+    },
+  },
+  {
+    label: '设置红灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightHFaultDs,
+    },
+  },
+  {
+    label: '设置绿灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightLFaultDs,
+    },
+  },
+  {
+    label: '设置黄灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightUFaultDs,
+    },
+  },
+  {
+    label: '取消红灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightHCancelDs,
+    },
+  },
+  {
+    label: '取消绿灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightLCancelDs,
+    },
+  },
+  {
+    label: '取消黄灯断丝故障',
+    value: {
+      aspect: state.Signal.Aspect.H,
+      operation: request.Signal.Operation.LightUCancelDs,
+    },
+  },
+];
+
 watch(
   () => lineStore.selectedGraphics,
   (val) => {
     if (val?.length == 1 && val[0].type == Signal.Type) {
-      setSignalState(val[0] as Signal);
+      initSignalState(val[0] as Signal);
     } else {
       signalState.value = {
         id: '',
@@ -55,7 +154,7 @@ watch(
     }
   }
 );
-function setSignalState(signal: Signal) {
+function initSignalState(signal: Signal) {
   signalState.value = {
     id: signal.datas.id,
     index: signal.datas.index,
@@ -68,13 +167,29 @@ function submitState() {
 }
 function onReset() {
   if (lineStore.selectedGraphics) {
-    setSignalState(lineStore.selectedGraphics[0] as Signal);
+    initSignalState(lineStore.selectedGraphics[0] as Signal);
   }
 }
+function doSignalOperation(item: {
+  label: string;
+  value: { aspect: state.Signal.Aspect; operation: request.Signal.Operation };
+}) {
+  const simulationId = useLineStore().simulationId || '';
+  const mapId = useLineStore().mapId as number;
+  setSignalState({
+    simulationId,
+    mapId,
+    id: signalState.value.id,
+    aspect: item.value.aspect,
+    operation: item.value.operation,
+  }).catch((err) => {
+    errorNotify('操作失败', { message: err.origin.response.data.title });
+  });
+}
 
 onMounted(() => {
   if (lineStore.selectedGraphics) {
-    setSignalState(lineStore.selectedGraphics[0] as Signal);
+    initSignalState(lineStore.selectedGraphics[0] as Signal);
   }
 });
 </script>
diff --git a/src/drawApp/graphics/SignalInteraction.ts b/src/drawApp/graphics/SignalInteraction.ts
index 769f50f..f649e70 100644
--- a/src/drawApp/graphics/SignalInteraction.ts
+++ b/src/drawApp/graphics/SignalInteraction.ts
@@ -20,6 +20,7 @@ import { useLineStore } from 'src/stores/line-store';
 import { SignalGraphicHitArea } from 'src/graphics/signal/SignalDrawAssistant';
 import { setSignalState } from 'src/api/Simulation';
 import { errorNotify } from 'src/utils/CommonNotify';
+import { request } from 'src/protos/request';
 
 export class SignalData extends GraphicDataBase implements ISignalData {
   constructor(data?: graphicData.Signal) {
@@ -237,6 +238,7 @@ export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
         mapId,
         id: signal.datas.id,
         aspect: state.Signal.Aspect.OFF,
+        operation: request.Signal.Operation.Display,
       }).catch((err) => {
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });
@@ -247,6 +249,7 @@ export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
         mapId,
         id: signal.datas.id,
         aspect: state.Signal.Aspect.H,
+        operation: request.Signal.Operation.Display,
       }).catch((err) => {
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });
@@ -257,6 +260,7 @@ export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
         mapId,
         id: signal.datas.id,
         aspect: state.Signal.Aspect.L,
+        operation: request.Signal.Operation.Display,
       }).catch((err) => {
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });
@@ -267,6 +271,7 @@ export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
         mapId,
         id: signal.datas.id,
         aspect: state.Signal.Aspect.U,
+        operation: request.Signal.Operation.Display,
       }).catch((err) => {
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });
@@ -277,6 +282,7 @@ export class SignalOperateInteraction extends GraphicInteractionPlugin<Signal> {
         mapId,
         id: signal.datas.id,
         aspect: state.Signal.Aspect.HU,
+        operation: request.Signal.Operation.Display,
       }).catch((err) => {
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });

From 0451397be29f0a7e8fc04ae27ff684c58e8f45a5 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 17:57:53 +0800
Subject: [PATCH 06/22] =?UTF-8?q?=E8=A7=A3=E6=9E=90proto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message                              |   2 +-
 src/drawApp/graphics/PslButtonInteraction.ts |  44 ++---
 src/drawApp/pslScene.ts                      |   2 +-
 src/protos/device_state.ts                   | 175 +++++++++++++++----
 src/protos/request.ts                        | 160 -----------------
 src/protos/stationLayoutGraphics.ts          |  23 ++-
 6 files changed, 179 insertions(+), 227 deletions(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index cff3d23..8e5d8fa 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit cff3d23475a6352e560e27f7b006727b3b884217
+Subproject commit 8e5d8faf7b16ddbc8cfdeb19f5a102cfdbac404b
diff --git a/src/drawApp/graphics/PslButtonInteraction.ts b/src/drawApp/graphics/PslButtonInteraction.ts
index 4e7affd..1ea4fbd 100644
--- a/src/drawApp/graphics/PslButtonInteraction.ts
+++ b/src/drawApp/graphics/PslButtonInteraction.ts
@@ -117,18 +117,37 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
     g.eventMode = 'static';
     g.cursor = 'pointer';
     g.selectable = true;
-    g.on('mousedown', this.onMouseDown, this);
+    // g.on('mousedown', this.onMouseDown, this);
     g.on('mouseup', this.onMouseUp, this);
   }
 
   unbind(g: PslButton): void {
     g.selectable = false;
     g.eventMode = 'none';
-    g.off('mousedown', this.onMouseDown, this);
+    // g.off('mousedown', this.onMouseDown, this);
     g.on('mouseup', this.onMouseUp, this);
   }
   //FederatedMouseEvent
-  onMouseDown(e: FederatedMouseEvent) {
+  // onMouseDown(e: FederatedMouseEvent) {
+  //   const simulationId = useLineStore().simulationId;
+  //   const mapId = useLineStore().mapId;
+  //   const gateBoxId = usePslStore().gatedBoxId;
+  //   const target = e.target as DisplayObject;
+  //   const pslButton = target.getGraphic() as PslButton;
+  //   if (!simulationId || !mapId) {
+  //     return;
+  //   }
+  //   pslOperate({
+  //     simulationId,
+  //     mapId,
+  //     buttonCode: pslButton.datas.code,
+  //     gateBoxId: gateBoxId,
+  //     down: true,
+  //   }).catch((err) => {
+  //     errorNotify('操作失败', { message: err.origin.response.data.title });
+  //   });
+  // }
+  onMouseUp(e: FederatedMouseEvent) {
     const simulationId = useLineStore().simulationId;
     const mapId = useLineStore().mapId;
     const gateBoxId = usePslStore().gatedBoxId;
@@ -147,23 +166,4 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
       errorNotify('操作失败', { message: err.origin.response.data.title });
     });
   }
-  onMouseUp(e: FederatedMouseEvent) {
-    const simulationId = useLineStore().simulationId;
-    const mapId = useLineStore().mapId;
-    const gateBoxId = usePslStore().gatedBoxId;
-    const target = e.target as DisplayObject;
-    const pslButton = target.getGraphic() as PslButton;
-    if (!simulationId || !mapId) {
-      return;
-    }
-    pslOperate({
-      simulationId,
-      mapId,
-      buttonCode: pslButton.datas.code,
-      gateBoxId: gateBoxId,
-      down: false,
-    }).catch((err) => {
-      errorNotify('操作失败', { message: err.origin.response.data.title });
-    });
-  }
 }
diff --git a/src/drawApp/pslScene.ts b/src/drawApp/pslScene.ts
index 70e2123..9ca2565 100644
--- a/src/drawApp/pslScene.ts
+++ b/src/drawApp/pslScene.ts
@@ -65,7 +65,7 @@ function handleSubscribe(pslScene: IGraphicScene) {
   app.subscribe({
     destination: `simulation-psl-${simulationId}_${mapId}_${pslId}-status`,
     messageConverter: (message: Uint8Array) => {
-      console.log('收到消息', message);
+      // console.log('收到消息', message);
       const states: GraphicState[] = [];
       // const storage = state.PushedDevicesStatus.deserialize(message);
       // if (storage.all) {
diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts
index ceddf2a..a90aa7a 100644
--- a/src/protos/device_state.ts
+++ b/src/protos/device_state.ts
@@ -2331,7 +2331,7 @@ export namespace state {
         constructor(data?: any[] | {
             id?: string;
             down?: boolean;
-            aspect?: Signal.Aspect;
+            active?: boolean;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -2342,8 +2342,8 @@ export namespace state {
                 if ("down" in data && data.down != undefined) {
                     this.down = data.down;
                 }
-                if ("aspect" in data && data.aspect != undefined) {
-                    this.aspect = data.aspect;
+                if ("active" in data && data.active != undefined) {
+                    this.active = data.active;
                 }
             }
         }
@@ -2359,16 +2359,16 @@ export namespace state {
         set down(value: boolean) {
             pb_1.Message.setField(this, 2, value);
         }
-        get aspect() {
-            return pb_1.Message.getFieldWithDefault(this, 3, Signal.Aspect.Non) as Signal.Aspect;
+        get active() {
+            return pb_1.Message.getFieldWithDefault(this, 3, false) as boolean;
         }
-        set aspect(value: Signal.Aspect) {
+        set active(value: boolean) {
             pb_1.Message.setField(this, 3, value);
         }
         static fromObject(data: {
             id?: string;
             down?: boolean;
-            aspect?: Signal.Aspect;
+            active?: boolean;
         }): ButtonState {
             const message = new ButtonState({});
             if (data.id != null) {
@@ -2377,8 +2377,8 @@ export namespace state {
             if (data.down != null) {
                 message.down = data.down;
             }
-            if (data.aspect != null) {
-                message.aspect = data.aspect;
+            if (data.active != null) {
+                message.active = data.active;
             }
             return message;
         }
@@ -2386,7 +2386,7 @@ export namespace state {
             const data: {
                 id?: string;
                 down?: boolean;
-                aspect?: Signal.Aspect;
+                active?: boolean;
             } = {};
             if (this.id != null) {
                 data.id = this.id;
@@ -2394,8 +2394,8 @@ export namespace state {
             if (this.down != null) {
                 data.down = this.down;
             }
-            if (this.aspect != null) {
-                data.aspect = this.aspect;
+            if (this.active != null) {
+                data.active = this.active;
             }
             return data;
         }
@@ -2407,8 +2407,8 @@ export namespace state {
                 writer.writeString(1, this.id);
             if (this.down != false)
                 writer.writeBool(2, this.down);
-            if (this.aspect != Signal.Aspect.Non)
-                writer.writeEnum(3, this.aspect);
+            if (this.active != false)
+                writer.writeBool(3, this.active);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2425,7 +2425,7 @@ export namespace state {
                         message.down = reader.readBool();
                         break;
                     case 3:
-                        message.aspect = reader.readEnum();
+                        message.active = reader.readBool();
                         break;
                     default: reader.skipField();
                 }
@@ -2533,7 +2533,7 @@ export namespace state {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
             id?: string;
-            aspect?: Signal.Aspect;
+            active?: boolean;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -2541,8 +2541,8 @@ export namespace state {
                 if ("id" in data && data.id != undefined) {
                     this.id = data.id;
                 }
-                if ("aspect" in data && data.aspect != undefined) {
-                    this.aspect = data.aspect;
+                if ("active" in data && data.active != undefined) {
+                    this.active = data.active;
                 }
             }
         }
@@ -2552,35 +2552,35 @@ export namespace state {
         set id(value: string) {
             pb_1.Message.setField(this, 1, value);
         }
-        get aspect() {
-            return pb_1.Message.getFieldWithDefault(this, 2, Signal.Aspect.Non) as Signal.Aspect;
+        get active() {
+            return pb_1.Message.getFieldWithDefault(this, 2, false) as boolean;
         }
-        set aspect(value: Signal.Aspect) {
+        set active(value: boolean) {
             pb_1.Message.setField(this, 2, value);
         }
         static fromObject(data: {
             id?: string;
-            aspect?: Signal.Aspect;
+            active?: boolean;
         }): LightState {
             const message = new LightState({});
             if (data.id != null) {
                 message.id = data.id;
             }
-            if (data.aspect != null) {
-                message.aspect = data.aspect;
+            if (data.active != null) {
+                message.active = data.active;
             }
             return message;
         }
         toObject() {
             const data: {
                 id?: string;
-                aspect?: Signal.Aspect;
+                active?: boolean;
             } = {};
             if (this.id != null) {
                 data.id = this.id;
             }
-            if (this.aspect != null) {
-                data.aspect = this.aspect;
+            if (this.active != null) {
+                data.active = this.active;
             }
             return data;
         }
@@ -2590,8 +2590,8 @@ export namespace state {
             const writer = w || new pb_1.BinaryWriter();
             if (this.id.length)
                 writer.writeString(1, this.id);
-            if (this.aspect != Signal.Aspect.Non)
-                writer.writeEnum(2, this.aspect);
+            if (this.active != false)
+                writer.writeBool(2, this.active);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2605,7 +2605,7 @@ export namespace state {
                         message.id = reader.readString();
                         break;
                     case 2:
-                        message.aspect = reader.readEnum();
+                        message.active = reader.readBool();
                         break;
                     default: reader.skipField();
                 }
@@ -2619,6 +2619,96 @@ export namespace state {
             return LightState.deserialize(bytes);
         }
     }
+    export class PsdState extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            id?: string;
+            openDoorCodes?: number[];
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("id" in data && data.id != undefined) {
+                    this.id = data.id;
+                }
+                if ("openDoorCodes" in data && data.openDoorCodes != undefined) {
+                    this.openDoorCodes = data.openDoorCodes;
+                }
+            }
+        }
+        get id() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set id(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get openDoorCodes() {
+            return pb_1.Message.getFieldWithDefault(this, 2, []) as number[];
+        }
+        set openDoorCodes(value: number[]) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        static fromObject(data: {
+            id?: string;
+            openDoorCodes?: number[];
+        }): PsdState {
+            const message = new PsdState({});
+            if (data.id != null) {
+                message.id = data.id;
+            }
+            if (data.openDoorCodes != null) {
+                message.openDoorCodes = data.openDoorCodes;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                id?: string;
+                openDoorCodes?: number[];
+            } = {};
+            if (this.id != null) {
+                data.id = this.id;
+            }
+            if (this.openDoorCodes != null) {
+                data.openDoorCodes = this.openDoorCodes;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.id.length)
+                writer.writeString(1, this.id);
+            if (this.openDoorCodes.length)
+                writer.writePackedInt32(2, this.openDoorCodes);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): PsdState {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new PsdState();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.id = reader.readString();
+                        break;
+                    case 2:
+                        message.openDoorCodes = reader.readPackedInt32();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): PsdState {
+            return PsdState.deserialize(bytes);
+        }
+    }
     export class VariationStatus extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -2789,9 +2879,10 @@ export namespace state {
             buttonState?: ButtonState[];
             AlarmState?: AlarmState[];
             LightState?: LightState[];
+            psdState?: PsdState[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8, 9], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("trainState" in data && data.trainState != undefined) {
                     this.trainState = data.trainState;
@@ -2817,6 +2908,9 @@ export namespace state {
                 if ("LightState" in data && data.LightState != undefined) {
                     this.LightState = data.LightState;
                 }
+                if ("psdState" in data && data.psdState != undefined) {
+                    this.psdState = data.psdState;
+                }
             }
         }
         get trainState() {
@@ -2867,6 +2961,12 @@ export namespace state {
         set LightState(value: LightState[]) {
             pb_1.Message.setRepeatedWrapperField(this, 8, value);
         }
+        get psdState() {
+            return pb_1.Message.getRepeatedWrapperField(this, PsdState, 9) as PsdState[];
+        }
+        set psdState(value: PsdState[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 9, value);
+        }
         static fromObject(data: {
             trainState?: ReturnType<typeof TrainState.prototype.toObject>[];
             switchState?: ReturnType<typeof SwitchState.prototype.toObject>[];
@@ -2876,6 +2976,7 @@ export namespace state {
             buttonState?: ReturnType<typeof ButtonState.prototype.toObject>[];
             AlarmState?: ReturnType<typeof AlarmState.prototype.toObject>[];
             LightState?: ReturnType<typeof LightState.prototype.toObject>[];
+            psdState?: ReturnType<typeof PsdState.prototype.toObject>[];
         }): AllDevicesStatus {
             const message = new AllDevicesStatus({});
             if (data.trainState != null) {
@@ -2902,6 +3003,9 @@ export namespace state {
             if (data.LightState != null) {
                 message.LightState = data.LightState.map(item => LightState.fromObject(item));
             }
+            if (data.psdState != null) {
+                message.psdState = data.psdState.map(item => PsdState.fromObject(item));
+            }
             return message;
         }
         toObject() {
@@ -2914,6 +3018,7 @@ export namespace state {
                 buttonState?: ReturnType<typeof ButtonState.prototype.toObject>[];
                 AlarmState?: ReturnType<typeof AlarmState.prototype.toObject>[];
                 LightState?: ReturnType<typeof LightState.prototype.toObject>[];
+                psdState?: ReturnType<typeof PsdState.prototype.toObject>[];
             } = {};
             if (this.trainState != null) {
                 data.trainState = this.trainState.map((item: TrainState) => item.toObject());
@@ -2939,6 +3044,9 @@ export namespace state {
             if (this.LightState != null) {
                 data.LightState = this.LightState.map((item: LightState) => item.toObject());
             }
+            if (this.psdState != null) {
+                data.psdState = this.psdState.map((item: PsdState) => item.toObject());
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -2961,6 +3069,8 @@ export namespace state {
                 writer.writeRepeatedMessage(7, this.AlarmState, (item: AlarmState) => item.serialize(writer));
             if (this.LightState.length)
                 writer.writeRepeatedMessage(8, this.LightState, (item: LightState) => item.serialize(writer));
+            if (this.psdState.length)
+                writer.writeRepeatedMessage(9, this.psdState, (item: PsdState) => item.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -2994,6 +3104,9 @@ export namespace state {
                     case 8:
                         reader.readMessage(message.LightState, () => pb_1.Message.addToRepeatedWrapperField(message, 8, LightState.deserialize(reader), LightState));
                         break;
+                    case 9:
+                        reader.readMessage(message.psdState, () => pb_1.Message.addToRepeatedWrapperField(message, 9, PsdState.deserialize(reader), PsdState));
+                        break;
                     default: reader.skipField();
                 }
             }
diff --git a/src/protos/request.ts b/src/protos/request.ts
index 8cb6f96..fd21add 100644
--- a/src/protos/request.ts
+++ b/src/protos/request.ts
@@ -3,7 +3,6 @@
  * compiler version: 4.23.1
  * source: request.proto
  * git: https://github.com/thesayyn/protoc-gen-ts */
-import * as dependency_1 from "./device_state";
 import * as pb_1 from "google-protobuf";
 export namespace request {
     export class Turnout extends pb_1.Message {
@@ -251,163 +250,4 @@ export namespace request {
             LightBCancelDs = 11
         }
     }
-    export class SignalOperationReq extends pb_1.Message {
-        #one_of_decls: number[][] = [];
-        constructor(data?: any[] | {
-            simulationId?: string;
-            mapId?: number;
-            deviceId?: string;
-            operation?: Signal.Operation;
-            aspect?: dependency_1.state.Signal.Aspect;
-        }) {
-            super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
-            if (!Array.isArray(data) && typeof data == "object") {
-                if ("simulationId" in data && data.simulationId != undefined) {
-                    this.simulationId = data.simulationId;
-                }
-                if ("mapId" in data && data.mapId != undefined) {
-                    this.mapId = data.mapId;
-                }
-                if ("deviceId" in data && data.deviceId != undefined) {
-                    this.deviceId = data.deviceId;
-                }
-                if ("operation" in data && data.operation != undefined) {
-                    this.operation = data.operation;
-                }
-                if ("aspect" in data && data.aspect != undefined) {
-                    this.aspect = data.aspect;
-                }
-            }
-        }
-        get simulationId() {
-            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
-        }
-        set simulationId(value: string) {
-            pb_1.Message.setField(this, 1, value);
-        }
-        get mapId() {
-            return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
-        }
-        set mapId(value: number) {
-            pb_1.Message.setField(this, 2, value);
-        }
-        get deviceId() {
-            return pb_1.Message.getFieldWithDefault(this, 3, "") as string;
-        }
-        set deviceId(value: string) {
-            pb_1.Message.setField(this, 3, value);
-        }
-        get operation() {
-            return pb_1.Message.getFieldWithDefault(this, 4, Signal.Operation.Undefined) as Signal.Operation;
-        }
-        set operation(value: Signal.Operation) {
-            pb_1.Message.setField(this, 4, value);
-        }
-        get aspect() {
-            return pb_1.Message.getFieldWithDefault(this, 5, dependency_1.state.Signal.Aspect.Non) as dependency_1.state.Signal.Aspect;
-        }
-        set aspect(value: dependency_1.state.Signal.Aspect) {
-            pb_1.Message.setField(this, 5, value);
-        }
-        static fromObject(data: {
-            simulationId?: string;
-            mapId?: number;
-            deviceId?: string;
-            operation?: Signal.Operation;
-            aspect?: dependency_1.state.Signal.Aspect;
-        }): SignalOperationReq {
-            const message = new SignalOperationReq({});
-            if (data.simulationId != null) {
-                message.simulationId = data.simulationId;
-            }
-            if (data.mapId != null) {
-                message.mapId = data.mapId;
-            }
-            if (data.deviceId != null) {
-                message.deviceId = data.deviceId;
-            }
-            if (data.operation != null) {
-                message.operation = data.operation;
-            }
-            if (data.aspect != null) {
-                message.aspect = data.aspect;
-            }
-            return message;
-        }
-        toObject() {
-            const data: {
-                simulationId?: string;
-                mapId?: number;
-                deviceId?: string;
-                operation?: Signal.Operation;
-                aspect?: dependency_1.state.Signal.Aspect;
-            } = {};
-            if (this.simulationId != null) {
-                data.simulationId = this.simulationId;
-            }
-            if (this.mapId != null) {
-                data.mapId = this.mapId;
-            }
-            if (this.deviceId != null) {
-                data.deviceId = this.deviceId;
-            }
-            if (this.operation != null) {
-                data.operation = this.operation;
-            }
-            if (this.aspect != null) {
-                data.aspect = this.aspect;
-            }
-            return data;
-        }
-        serialize(): Uint8Array;
-        serialize(w: pb_1.BinaryWriter): void;
-        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
-            const writer = w || new pb_1.BinaryWriter();
-            if (this.simulationId.length)
-                writer.writeString(1, this.simulationId);
-            if (this.mapId != 0)
-                writer.writeInt32(2, this.mapId);
-            if (this.deviceId.length)
-                writer.writeString(3, this.deviceId);
-            if (this.operation != Signal.Operation.Undefined)
-                writer.writeEnum(4, this.operation);
-            if (this.aspect != dependency_1.state.Signal.Aspect.Non)
-                writer.writeEnum(5, this.aspect);
-            if (!w)
-                return writer.getResultBuffer();
-        }
-        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): SignalOperationReq {
-            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new SignalOperationReq();
-            while (reader.nextField()) {
-                if (reader.isEndGroup())
-                    break;
-                switch (reader.getFieldNumber()) {
-                    case 1:
-                        message.simulationId = reader.readString();
-                        break;
-                    case 2:
-                        message.mapId = reader.readInt32();
-                        break;
-                    case 3:
-                        message.deviceId = reader.readString();
-                        break;
-                    case 4:
-                        message.operation = reader.readEnum();
-                        break;
-                    case 5:
-                        message.aspect = reader.readEnum();
-                        break;
-                    default: reader.skipField();
-                }
-            }
-            return message;
-        }
-        serializeBinary(): Uint8Array {
-            return this.serialize();
-        }
-        static deserializeBinary(bytes: Uint8Array): SignalOperationReq {
-            return SignalOperationReq.deserialize(bytes);
-        }
-    }
 }
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index a3e538e..ba613a1 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -2798,7 +2798,7 @@ export namespace graphicData {
             index?: number;
             refDev?: RelatedRef;
             centralizedStations?: string[];
-            mt?: Signal.ModelType;
+            mt?: Signal.Model;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [9], this.#one_of_decls);
@@ -2881,9 +2881,9 @@ export namespace graphicData {
             pb_1.Message.setField(this, 9, value);
         }
         get mt() {
-            return pb_1.Message.getFieldWithDefault(this, 10, Signal.ModelType.N) as Signal.ModelType;
+            return pb_1.Message.getFieldWithDefault(this, 10, Signal.Model.HLU) as Signal.Model;
         }
-        set mt(value: Signal.ModelType) {
+        set mt(value: Signal.Model) {
             pb_1.Message.setField(this, 10, value);
         }
         static fromObject(data: {
@@ -2894,7 +2894,7 @@ export namespace graphicData {
             index?: number;
             refDev?: ReturnType<typeof RelatedRef.prototype.toObject>;
             centralizedStations?: string[];
-            mt?: Signal.ModelType;
+            mt?: Signal.Model;
         }): Signal {
             const message = new Signal({});
             if (data.common != null) {
@@ -2932,7 +2932,7 @@ export namespace graphicData {
                 index?: number;
                 refDev?: ReturnType<typeof RelatedRef.prototype.toObject>;
                 centralizedStations?: string[];
-                mt?: Signal.ModelType;
+                mt?: Signal.Model;
             } = {};
             if (this.common != null) {
                 data.common = this.common.toObject();
@@ -2978,7 +2978,7 @@ export namespace graphicData {
                 writer.writeMessage(8, this.refDev, () => this.refDev.serialize(writer));
             if (this.centralizedStations.length)
                 writer.writeRepeatedString(9, this.centralizedStations);
-            if (this.mt != Signal.ModelType.N)
+            if (this.mt != Signal.Model.HLU)
                 writer.writeEnum(10, this.mt);
             if (!w)
                 return writer.getResultBuffer();
@@ -3026,14 +3026,13 @@ export namespace graphicData {
         }
     }
     export namespace Signal {
-        export enum ModelType {
-            N = 0,
+        export enum Model {
+            HLU = 0,
             HL = 1,
             HLU_FU = 2,
-            HLU = 3,
-            HLU_FL = 4,
-            AB = 5,
-            HBU = 6
+            HLU_FL = 3,
+            AB = 4,
+            HBU = 5
         }
     }
     export class Section extends pb_1.Message {

From 83a3a369b450491d12d0b636d1fdb1369e59cd69 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Fri, 20 Oct 2023 10:04:15 +0800
Subject: [PATCH 07/22] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=92=8C=E8=BD=A6=E7=AB=99=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draw-app/properties/StationProperty.vue   | 11 +++++-
 src/drawApp/commonApp.ts                      | 10 ++++-
 src/drawApp/graphics/ScreenDoorInteraction.ts | 37 ++++++++++++++++++-
 src/drawApp/graphics/StationInteraction.ts    |  6 +++
 src/drawApp/lineScene.ts                      | 12 +++++-
 src/graphics/screenDoor/ScreenDoor.ts         | 25 ++++++++++---
 src/graphics/station/Station.ts               |  6 ++-
 src/protos/stationLayoutGraphics.ts           | 23 ++++++++++++
 8 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/src/components/draw-app/properties/StationProperty.vue b/src/components/draw-app/properties/StationProperty.vue
index d131b70..454d2ed 100644
--- a/src/components/draw-app/properties/StationProperty.vue
+++ b/src/components/draw-app/properties/StationProperty.vue
@@ -3,13 +3,22 @@
     <q-input outlined readonly v-model="stationModel.id" label="id" />
     <q-input
       outlined
-      label="车站名称"
+      label="车站站名"
       type="textarea"
       @blur="onUpdate"
       v-model="stationModel.code"
       lazy-rules
       autogrow
     />
+    <q-input
+      outlined
+      label="车站名"
+      type="textarea"
+      @blur="onUpdate"
+      v-model="stationModel.stationName"
+      lazy-rules
+      autogrow
+    />
     <q-input
       outlined
       v-model.number="stationModel.index"
diff --git a/src/drawApp/commonApp.ts b/src/drawApp/commonApp.ts
index 37f28ce..36f7e76 100644
--- a/src/drawApp/commonApp.ts
+++ b/src/drawApp/commonApp.ts
@@ -17,7 +17,10 @@ import {
   ScreenDoor,
   ScreenDoorTemplate,
 } from 'src/graphics/screenDoor/ScreenDoor';
-import { ScreenDoorData } from './graphics/ScreenDoorInteraction';
+import {
+  ScreenDoorData,
+  ScreenDoorState,
+} from './graphics/ScreenDoorInteraction';
 import { ScreenDoorDraw } from 'src/graphics/screenDoor/ScreenDoorDrawAssistant';
 import { Station, StationTemplate } from 'src/graphics/station/Station';
 import { StationDraw } from 'src/graphics/station/StationDrawAssistant';
@@ -168,7 +171,10 @@ export function initCommonDrawApp(app: IDrawApp) {
     app,
     new PlatformTemplate(new PlatformData(), new PlatformState())
   );
-  new ScreenDoorDraw(app, new ScreenDoorTemplate(new ScreenDoorData()));
+  new ScreenDoorDraw(
+    app,
+    new ScreenDoorTemplate(new ScreenDoorData(), new ScreenDoorState())
+  );
   new StationDraw(
     app,
     new StationTemplate(new StationData(), new StationState())
diff --git a/src/drawApp/graphics/ScreenDoorInteraction.ts b/src/drawApp/graphics/ScreenDoorInteraction.ts
index 3041a9e..a6b0e14 100644
--- a/src/drawApp/graphics/ScreenDoorInteraction.ts
+++ b/src/drawApp/graphics/ScreenDoorInteraction.ts
@@ -1,10 +1,12 @@
 import * as pb_1 from 'google-protobuf';
 import {
   IScreenDoorData,
+  IScreenDoorState,
   ScreenDoor,
 } from 'src/graphics/screenDoor/ScreenDoor';
 import { graphicData } from 'src/protos/stationLayoutGraphics';
-import { GraphicDataBase } from './GraphicDataBase';
+import { GraphicDataBase, GraphicStateBase } from './GraphicDataBase';
+import { state } from 'src/protos/device_state';
 
 export class ScreenDoorData extends GraphicDataBase implements IScreenDoorData {
   constructor(data?: graphicData.ScreenDoor) {
@@ -59,3 +61,36 @@ export class ScreenDoorData extends GraphicDataBase implements IScreenDoorData {
     return pb_1.Message.equals(this.data, other.data);
   }
 }
+
+export class ScreenDoorState
+  extends GraphicStateBase
+  implements IScreenDoorState
+{
+  constructor(proto?: state.PsdState) {
+    let states;
+    if (proto) {
+      states = proto;
+    } else {
+      states = new state.PsdState();
+    }
+    super(states, ScreenDoor.Type);
+  }
+  get code(): string {
+    return this.states.id;
+  }
+  get openDoorCodes() {
+    return this.states.openDoorCodes;
+  }
+  get states(): state.PsdState {
+    return this.getState<state.PsdState>();
+  }
+  clone(): ScreenDoorState {
+    return new ScreenDoorState(this.states.cloneMessage());
+  }
+  copyFrom(data: GraphicStateBase): void {
+    pb_1.Message.copyInto(data._state, this._state);
+  }
+  eq(data: GraphicStateBase): boolean {
+    return pb_1.Message.equals(this._state, data._state);
+  }
+}
diff --git a/src/drawApp/graphics/StationInteraction.ts b/src/drawApp/graphics/StationInteraction.ts
index 422fca7..b799381 100644
--- a/src/drawApp/graphics/StationInteraction.ts
+++ b/src/drawApp/graphics/StationInteraction.ts
@@ -43,6 +43,12 @@ export class StationData extends GraphicDataBase implements IStationData {
   set code(v: string) {
     this.data.code = v;
   }
+  get stationName(): string {
+    return this.data.stationName;
+  }
+  set stationName(v: string) {
+    this.data.stationName = v;
+  }
   get kilometerSystem(): KilometerSystem {
     if (!this.data.kilometerSystem) {
       this.data.kilometerSystem = new graphicData.KilometerSystem();
diff --git a/src/drawApp/lineScene.ts b/src/drawApp/lineScene.ts
index 8254e22..613a315 100644
--- a/src/drawApp/lineScene.ts
+++ b/src/drawApp/lineScene.ts
@@ -21,7 +21,10 @@ import {
   PlatformState,
 } from './graphics/PlatformInteraction';
 import { PlatformTemplate, Platform } from 'src/graphics/platform/Platform';
-import { ScreenDoorData } from './graphics/ScreenDoorInteraction';
+import {
+  ScreenDoorData,
+  ScreenDoorState,
+} from './graphics/ScreenDoorInteraction';
 import {
   ScreenDoor,
   ScreenDoorTemplate,
@@ -209,7 +212,7 @@ export function initLineScene(lineApp: IGraphicApp, sceneName: string) {
       getTypeConsts(Signal.Type)
     ),
     new PlatformTemplate(new PlatformData(), new PlatformState()),
-    new ScreenDoorTemplate(new ScreenDoorData()),
+    new ScreenDoorTemplate(new ScreenDoorData(), new ScreenDoorState()),
     new StationTemplate(new StationData(), new StationState()),
     new TurnoutTemplate(new TurnoutData(), new TurnoutStates()),
     new SectionTemplate(new SectionData()),
@@ -284,6 +287,11 @@ function handleSubscribe(lineScene: IGraphicScene) {
             // states.push(new SectionState(item));
           }
         });
+        storage.allStatus.psdState.forEach((item) => {
+          if (item.id) {
+            states.push(new ScreenDoorState(item));
+          }
+        });
         storage.allStatus.switchState.forEach((item) => {
           // 道岔
           if (item.id) {
diff --git a/src/graphics/screenDoor/ScreenDoor.ts b/src/graphics/screenDoor/ScreenDoor.ts
index 494089e..a5d3a99 100644
--- a/src/graphics/screenDoor/ScreenDoor.ts
+++ b/src/graphics/screenDoor/ScreenDoor.ts
@@ -1,6 +1,7 @@
 import { Color, Container, Graphics } from 'pixi.js';
 import {
   GraphicData,
+  GraphicState,
   JlGraphic,
   JlGraphicTemplate,
   VectorText,
@@ -23,11 +24,15 @@ export interface IScreenDoorData extends GraphicData {
   eq(other: IScreenDoorData): boolean;
 }
 
+export interface IScreenDoorState extends GraphicState {
+  get openDoorCodes(): number[]; //打开的屏蔽门的编号
+}
+
 const screenDoorConsts = {
   lineWidth: 3,
   smallDoorWidth: 10,
-  doorGreen: '0x00FF00', //屏蔽门的颜色
-  doorRed: '0xff0000',
+  doorClose: '0x00FF00', //屏蔽门的颜色
+  doorOpen: '0xff0000',
 };
 
 class smallDoorGraphic extends Container {
@@ -42,12 +47,14 @@ class smallDoorGraphic extends Container {
     this.addChild(this.smallDoorGraphic);
     this.addChild(this.labelGraphic);
   }
-  draw(data: IScreenDoorData, i: number): void {
+  draw(data: IScreenDoorData, i: number, open: boolean): void {
     const start =
       (-screenDoorConsts.smallDoorWidth * data.sonDoorAmount) / 2 +
       screenDoorConsts.smallDoorWidth * i;
     const smallDoorGraphic = this.smallDoorGraphic;
-    const lineColor = screenDoorConsts.doorGreen;
+    const lineColor = open
+      ? screenDoorConsts.doorOpen
+      : screenDoorConsts.doorClose;
     const direction = 'up';
     smallDoorGraphic
       .lineStyle(screenDoorConsts.lineWidth, new Color(lineColor))
@@ -79,6 +86,10 @@ export class ScreenDoor extends JlGraphic {
     return this.getDatas<IScreenDoorData>();
   }
 
+  get states(): IScreenDoorState {
+    return this.getStates<IScreenDoorState>();
+  }
+
   doRepaint(): void {
     const doorGraphic = this.doorGraphic;
     doorGraphic.children.forEach((g) => {
@@ -88,7 +99,7 @@ export class ScreenDoor extends JlGraphic {
     this.datas.sonDoorAmount = this.datas?.sonDoorAmount || 30;
     for (let i = 0; i < this.datas.sonDoorAmount; i++) {
       const smallDoor = new smallDoorGraphic();
-      smallDoor.draw(this.datas, i);
+      smallDoor.draw(this.datas, i, this.states.openDoorCodes.includes(i));
       doorGraphic.addChild(smallDoor);
     }
   }
@@ -130,14 +141,16 @@ export class ScreenDoor extends JlGraphic {
 }
 
 export class ScreenDoorTemplate extends JlGraphicTemplate<ScreenDoor> {
-  constructor(dataTemplate: IScreenDoorData) {
+  constructor(dataTemplate: IScreenDoorData, stateTemplate?: IScreenDoorState) {
     super(ScreenDoor.Type, {
       dataTemplate,
+      stateTemplate,
     });
   }
   new(): ScreenDoor {
     const screenDoor = new ScreenDoor();
     screenDoor.loadData(this.datas);
+    screenDoor.loadState(this.states);
     return screenDoor;
   }
 }
diff --git a/src/graphics/station/Station.ts b/src/graphics/station/Station.ts
index a5bd6fc..b5c979d 100644
--- a/src/graphics/station/Station.ts
+++ b/src/graphics/station/Station.ts
@@ -8,8 +8,10 @@ import {
 import { KilometerSystem } from '../signal/Signal';
 
 export interface IStationData extends GraphicData {
-  get code(): string; // 编号
+  get code(): string; // 车站站名
   set code(v: string);
+  get stationName(): string; // 车站名
+  set stationName(v: string);
   get kilometerSystem(): KilometerSystem;
   set kilometerSystem(v: KilometerSystem);
   get concentrationStations(): boolean; //是否集中站
@@ -36,7 +38,7 @@ const stationConsts = {
 };
 export class Station extends JlGraphic {
   static Type = 'station';
-  codeGraph: VectorText = new VectorText(''); //车站名
+  codeGraph: VectorText = new VectorText(''); //车站站名
   kilometerGraph: VectorText = new VectorText(''); //公里标
   constructor() {
     super(Station.Type);
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index ba613a1..c701c22 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -1755,6 +1755,7 @@ export namespace graphicData {
             kilometerSystem?: KilometerSystem;
             index?: number;
             refIbpMapCode?: string;
+            stationName?: string;
         }) {
             super();
             pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@@ -1777,6 +1778,9 @@ export namespace graphicData {
                 if ("refIbpMapCode" in data && data.refIbpMapCode != undefined) {
                     this.refIbpMapCode = data.refIbpMapCode;
                 }
+                if ("stationName" in data && data.stationName != undefined) {
+                    this.stationName = data.stationName;
+                }
             }
         }
         get common() {
@@ -1821,6 +1825,12 @@ export namespace graphicData {
         set refIbpMapCode(value: string) {
             pb_1.Message.setField(this, 8, value);
         }
+        get stationName() {
+            return pb_1.Message.getFieldWithDefault(this, 9, "") as string;
+        }
+        set stationName(value: string) {
+            pb_1.Message.setField(this, 9, value);
+        }
         static fromObject(data: {
             common?: ReturnType<typeof CommonInfo.prototype.toObject>;
             code?: string;
@@ -1828,6 +1838,7 @@ export namespace graphicData {
             kilometerSystem?: ReturnType<typeof KilometerSystem.prototype.toObject>;
             index?: number;
             refIbpMapCode?: string;
+            stationName?: string;
         }): Station {
             const message = new Station({});
             if (data.common != null) {
@@ -1848,6 +1859,9 @@ export namespace graphicData {
             if (data.refIbpMapCode != null) {
                 message.refIbpMapCode = data.refIbpMapCode;
             }
+            if (data.stationName != null) {
+                message.stationName = data.stationName;
+            }
             return message;
         }
         toObject() {
@@ -1858,6 +1872,7 @@ export namespace graphicData {
                 kilometerSystem?: ReturnType<typeof KilometerSystem.prototype.toObject>;
                 index?: number;
                 refIbpMapCode?: string;
+                stationName?: string;
             } = {};
             if (this.common != null) {
                 data.common = this.common.toObject();
@@ -1877,6 +1892,9 @@ export namespace graphicData {
             if (this.refIbpMapCode != null) {
                 data.refIbpMapCode = this.refIbpMapCode;
             }
+            if (this.stationName != null) {
+                data.stationName = this.stationName;
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -1895,6 +1913,8 @@ export namespace graphicData {
                 writer.writeInt32(7, this.index);
             if (this.refIbpMapCode.length)
                 writer.writeString(8, this.refIbpMapCode);
+            if (this.stationName.length)
+                writer.writeString(9, this.stationName);
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -1922,6 +1942,9 @@ export namespace graphicData {
                     case 8:
                         message.refIbpMapCode = reader.readString();
                         break;
+                    case 9:
+                        message.stationName = reader.readString();
+                        break;
                     default: reader.skipField();
                 }
             }

From 9e0f9296aeb44dcc79fc670e5224b6fc7e7109e5 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 20 Oct 2023 11:04:03 +0800
Subject: [PATCH 08/22] =?UTF-8?q?pslButton=E7=8A=B6=E6=80=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/graphics/PslButtonInteraction.ts |  2 --
 src/drawApp/pslApp.ts                        |  7 +++++--
 src/drawApp/pslScene.ts                      | 19 +++++++++---------
 src/graphics/pslButton/pslButton.ts          | 21 +++++++++++++++-----
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/drawApp/graphics/PslButtonInteraction.ts b/src/drawApp/graphics/PslButtonInteraction.ts
index 1ea4fbd..2795dab 100644
--- a/src/drawApp/graphics/PslButtonInteraction.ts
+++ b/src/drawApp/graphics/PslButtonInteraction.ts
@@ -63,7 +63,6 @@ export class PslButtonData extends GraphicDataBase implements IPslButtonData {
     return pb_1.Message.equals(this.data, other.data);
   }
 }
-//GraphicStateBase
 export class PslButtonState
   extends GraphicStateBase
   implements IPslButtonState
@@ -127,7 +126,6 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
     // g.off('mousedown', this.onMouseDown, this);
     g.on('mouseup', this.onMouseUp, this);
   }
-  //FederatedMouseEvent
   // onMouseDown(e: FederatedMouseEvent) {
   //   const simulationId = useLineStore().simulationId;
   //   const mapId = useLineStore().mapId;
diff --git a/src/drawApp/pslApp.ts b/src/drawApp/pslApp.ts
index ba8bee5..1a5a4ef 100644
--- a/src/drawApp/pslApp.ts
+++ b/src/drawApp/pslApp.ts
@@ -23,7 +23,7 @@ import { PslLightDraw } from 'src/graphics/pslLight/pslLightDrawAssistant';
 import { PslKey, PslKeyTemplate } from 'src/graphics/pslKey/pslKey';
 import { PslKeyData } from './graphics/PslKeyInteraction';
 import { PslButton, PslButtonTemplate } from 'src/graphics/pslButton/pslButton';
-import { PslButtonData } from './graphics/PslButtonInteraction';
+import { PslButtonData, PslButtonState } from './graphics/PslButtonInteraction';
 import { PslLight, PslLightTemplate } from 'src/graphics/pslLight/pslLight';
 import { PslLightData } from './graphics/PslLightInteraction';
 import {
@@ -75,7 +75,10 @@ export function initPslDrawApp(): IDrawApp {
   const app = drawApp;
   //根据草稿图类型加载绘图工具
   new PslKeyDraw(app, new PslKeyTemplate(new PslKeyData()));
-  new PslButtonDraw(app, new PslButtonTemplate(new PslButtonData()));
+  new PslButtonDraw(
+    app,
+    new PslButtonTemplate(new PslButtonData(), new PslButtonState())
+  );
   new PslLightDraw(app, new PslLightTemplate(new PslLightData()));
   new TextContentDraw(app, new TextContentTemplate(new PslTextData()));
 
diff --git a/src/drawApp/pslScene.ts b/src/drawApp/pslScene.ts
index 9ca2565..d6fc511 100644
--- a/src/drawApp/pslScene.ts
+++ b/src/drawApp/pslScene.ts
@@ -36,7 +36,7 @@ export function initPslScene(lineApp: IGraphicApp, sceneName: string) {
   });
   const graphicTemplate = [
     new PslKeyTemplate(new PslKeyData()),
-    new PslButtonTemplate(new PslButtonData()),
+    new PslButtonTemplate(new PslButtonData(), new PslButtonState()),
     new PslLightTemplate(new PslLightData()),
     new TextContentTemplate(new PslTextData()),
   ];
@@ -67,15 +67,14 @@ function handleSubscribe(pslScene: IGraphicScene) {
     messageConverter: (message: Uint8Array) => {
       // console.log('收到消息', message);
       const states: GraphicState[] = [];
-      // const storage = state.PushedDevicesStatus.deserialize(message);
-      // if (storage.all) {
-      //   storage.allStatus.buttonState.forEach((item) => {
-      //     // 道岔
-      //     if (item.id) {
-      //       states.push(new PslButtonState(item));
-      //     }
-      //   });
-      // }
+      const storage = state.PushedDevicesStatus.deserialize(message);
+      if (storage.all) {
+        //   storage.allStatus.buttonState.forEach((item) => {
+        //     if (item.id) {
+        //       states.push(new PslButtonState(item));
+        //     }
+        //   });
+      }
       // console.log(states, 'states');
       return states;
     },
diff --git a/src/graphics/pslButton/pslButton.ts b/src/graphics/pslButton/pslButton.ts
index 34e368c..6412846 100644
--- a/src/graphics/pslButton/pslButton.ts
+++ b/src/graphics/pslButton/pslButton.ts
@@ -50,27 +50,38 @@ export class PslButton extends JlGraphic {
   get datas(): IPslButtonData {
     return this.getDatas<IPslButtonData>();
   }
+  get states(): IPslButtonState {
+    return this.getStates<IPslButtonState>();
+  }
   doRepaint(): void {
     this._pslButton.rotation = 0;
     if (this.datas.buttonColor === pslGraphicData.PslElementColor.green) {
-      this._pslButton.texture = this.pslButtonTextures.greenBtn;
+      if (this.states.down) {
+        this._pslButton.texture = this.pslButtonTextures.greenBtnPress;
+      } else {
+        this._pslButton.texture = this.pslButtonTextures.greenBtn;
+      }
     } else {
-      this._pslButton.texture = this.pslButtonTextures.redBtn;
+      if (this.states.down) {
+        this._pslButton.texture = this.pslButtonTextures.redBtnPress;
+      } else {
+        this._pslButton.texture = this.pslButtonTextures.redBtn;
+      }
     }
   }
 }
 
 export class PslButtonTemplate extends JlGraphicTemplate<PslButton> {
   pslButtonTextures?: PslButtonTextures;
-  constructor(dataTemplate: IPslButtonData) {
-    super(PslButton.Type, { dataTemplate });
+  constructor(dataTemplate: IPslButtonData, stateTemplate: IPslButtonState) {
+    super(PslButton.Type, { dataTemplate, stateTemplate });
     this.loadAssets();
   }
   new(): PslButton {
     if (this.pslButtonTextures) {
       const g = new PslButton(this.pslButtonTextures);
       g.loadData(this.datas);
-      // g.loadState(this.states);
+      g.loadState(this.states);
       return g;
     }
     throw new Error('资源未加载/加载失败');

From 17fabb401a57d5f528c05c05c26361c9b27f630d Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Fri, 20 Oct 2023 13:17:57 +0800
Subject: [PATCH 09/22] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E9=97=A8=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/graphics/platform/Platform.ts     | 70 ---------------------------
 src/graphics/relay/Relay.ts           |  9 ++--
 src/graphics/screenDoor/ScreenDoor.ts |  9 +---
 3 files changed, 5 insertions(+), 83 deletions(-)

diff --git a/src/graphics/platform/Platform.ts b/src/graphics/platform/Platform.ts
index e5f8edc..42fc0b1 100644
--- a/src/graphics/platform/Platform.ts
+++ b/src/graphics/platform/Platform.ts
@@ -59,76 +59,6 @@ export class rectGraphic extends Container {
     this.rectGraphic.clear();
   }
 }
-//子元素--站台旁菱形图标
-/* class emergClose extends JlGraphic {
-  static Type = 'emergClose';
-  lozenge: Graphics;
-  deltaTime = 0;
-  fillColor = PlatformColorEnum.lozengeRed;
-  constructor() {
-    super(emergClose.Type);
-    this.lozenge = new Graphics();
-    this.addChild(this.lozenge);
-  }
-  draw(): void {
-    const lozenge = this.lozenge;
-    lozenge.clear();
-    lozenge.lineStyle(1, new Color(this.fillColor));
-    lozenge.beginFill(PlatformColorEnum.lozengeRed, 1);
-    lozenge.drawRect(
-      0,
-      0,
-      platformConsts.height / 4,
-      platformConsts.height / 4
-    );
-    lozenge.endFill();
-    const rect = new Rectangle(
-      0,
-      0,
-      platformConsts.height / 4,
-      platformConsts.height / 4
-    );
-    lozenge.pivot = getRectangleCenter(rect);
-    lozenge.rotation = Math.PI / 4;
-    lozenge.visible = false;
-  }
-  doRepaint() {
-    // this.draw()
-  }
-  clear(): void {
-    this.lozenge.clear();
-  }
-  createFlashAnmiation(name: string): GraphicAnimation {
-    const flashAnmiation = GraphicAnimation.init({
-      name: name,
-      run: (dt: number) => {
-        this.deltaTime += dt;
-        if (this.deltaTime > 60) {
-          this.deltaTime = 0;
-          this.lozenge.visible = false;
-        } else if (this.deltaTime > 30) {
-          this.lozenge.visible = true;
-        }
-      },
-    });
-    return flashAnmiation;
-  }
-  changeState(id: string, stateData: IPlatformState): void {
-    let redFlash = this.animation(`${id}emergClose_red_flash`);
-  if (stateData.emergstop) {
-    if (!redFlash) {
-      redFlash = this.createFlashAnmiation(`${id}emergClose_red_flash`);
-      this.addAnimation(redFlash);
-    }
-    redFlash.resume();
-  } else {
-    if (redFlash) {
-      redFlash.pause();
-    }
-  }
-  }
-} */
-
 export class Platform extends JlGraphic {
   static Type = 'Platform';
   rectGraphic: rectGraphic = new rectGraphic();
diff --git a/src/graphics/relay/Relay.ts b/src/graphics/relay/Relay.ts
index 1cd2ad6..e594416 100644
--- a/src/graphics/relay/Relay.ts
+++ b/src/graphics/relay/Relay.ts
@@ -56,12 +56,9 @@ export class Relay extends JlGraphic {
     this.labelGraphic.position.set(0, 20);
     this.refDevice.position.set(0, -20);
     const relayGraphic = this.relayGraphic;
-    let relayColor;
-    if (this.states?.xh) {
-      relayColor = relayConsts.closeColor;
-    } else {
-      relayColor = relayConsts.openColor;
-    }
+    const relayColor = this.states.xh
+      ? relayConsts.closeColor
+      : relayConsts.openColor;
     relayGraphic
       .clear()
       .lineStyle(relayConsts.lineWidth, new Color(relayColor))
diff --git a/src/graphics/screenDoor/ScreenDoor.ts b/src/graphics/screenDoor/ScreenDoor.ts
index a5d3a99..14bc0c9 100644
--- a/src/graphics/screenDoor/ScreenDoor.ts
+++ b/src/graphics/screenDoor/ScreenDoor.ts
@@ -55,16 +55,11 @@ class smallDoorGraphic extends Container {
     const lineColor = open
       ? screenDoorConsts.doorOpen
       : screenDoorConsts.doorClose;
-    const direction = 'up';
     smallDoorGraphic
       .lineStyle(screenDoorConsts.lineWidth, new Color(lineColor))
       .moveTo(start, 0)
       .lineTo(start + screenDoorConsts.smallDoorWidth - 3, 0);
-    if (direction == 'up') {
-      this.labelGraphic.text = i + 1;
-    } else {
-      this.labelGraphic.text = data.sonDoorAmount - i;
-    }
+    this.labelGraphic.text = i + 1;
     this.labelGraphic.style.fill = 'red';
     if (i % 2 == 0) {
       this.labelGraphic.position.set(start + 4, 7);
@@ -99,7 +94,7 @@ export class ScreenDoor extends JlGraphic {
     this.datas.sonDoorAmount = this.datas?.sonDoorAmount || 30;
     for (let i = 0; i < this.datas.sonDoorAmount; i++) {
       const smallDoor = new smallDoorGraphic();
-      smallDoor.draw(this.datas, i, this.states.openDoorCodes.includes(i));
+      smallDoor.draw(this.datas, i, this.states.openDoorCodes.includes(i + 1));
       doorGraphic.addChild(smallDoor);
     }
   }

From 78f7aa1faad556543a2ba5473371dd70b26b70d8 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 20 Oct 2023 13:19:34 +0800
Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=A1=E5=8F=B7=E6=9C=BA=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bj-rtss-message                               |   2 +-
 .../draw-app/properties/SignalProperty.vue    |  22 +++-
 src/drawApp/graphics/SignalInteraction.ts     |   6 +
 src/graphics/signal/Signal.ts                 |   3 +
 src/protos/device_state.ts                    | 115 +++++++++++++++++-
 5 files changed, 144 insertions(+), 4 deletions(-)

diff --git a/bj-rtss-message b/bj-rtss-message
index 8e5d8fa..9b1c6d7 160000
--- a/bj-rtss-message
+++ b/bj-rtss-message
@@ -1 +1 @@
-Subproject commit 8e5d8faf7b16ddbc8cfdeb19f5a102cfdbac404b
+Subproject commit 9b1c6d78012eff4f9d300412ad41c8175751767d
diff --git a/src/components/draw-app/properties/SignalProperty.vue b/src/components/draw-app/properties/SignalProperty.vue
index 1826786..9705182 100644
--- a/src/components/draw-app/properties/SignalProperty.vue
+++ b/src/components/draw-app/properties/SignalProperty.vue
@@ -15,6 +15,16 @@
       @blur="onUpdate"
       label="索引"
     />
+    <q-select
+      outlined
+      class="q-mt-sm"
+      v-model="signalModel.mt"
+      :options="SignalTypeOptions"
+      :map-options="true"
+      :emit-value="true"
+      @update:model-value="onUpdate"
+      label="信号机类型:"
+    ></q-select>
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
@@ -48,7 +58,7 @@
     <q-select
       outlined
       class="q-mt-sm"
-      :model-value="refDevData.deviceType"
+      v-model="refDevData.deviceType"
       :options="DeviceTypeOptions"
       readonly
       map-options
@@ -58,7 +68,7 @@
     <q-input
       outlined
       class="q-mt-sm"
-      :model-value="refDevData.code"
+      v-model="refDevData.code"
       :readonly="true"
       label="关联设备:"
     ></q-input>
@@ -128,6 +138,14 @@ const DeviceTypeOptions = [
   { label: '区段', value: graphicData.RelatedRef.DeviceType.Section },
   { label: '道岔', value: graphicData.RelatedRef.DeviceType.Turnout },
 ];
+const SignalTypeOptions = [
+  { label: '红绿黄', value: graphicData.Signal.Model.HLU },
+  { label: '红绿', value: graphicData.Signal.Model.HL },
+  { label: '红绿黄，封黄灯', value: graphicData.Signal.Model.HLU_FU },
+  { label: '红绿黄，封绿灯', value: graphicData.Signal.Model.HLU_FL },
+  { label: '蓝白', value: graphicData.Signal.Model.AB },
+  { label: '红白黄', value: graphicData.Signal.Model.HBU },
+];
 const DevicePortOptions = [
   { label: 'A端', value: graphicData.RelatedRef.DevicePort.A },
   { label: 'B端', value: graphicData.RelatedRef.DevicePort.B },
diff --git a/src/drawApp/graphics/SignalInteraction.ts b/src/drawApp/graphics/SignalInteraction.ts
index f649e70..3d17049 100644
--- a/src/drawApp/graphics/SignalInteraction.ts
+++ b/src/drawApp/graphics/SignalInteraction.ts
@@ -76,6 +76,12 @@ export class SignalData extends GraphicDataBase implements ISignalData {
   set centralizedStations(v: string[]) {
     this.data.centralizedStations = v;
   }
+  get mt(): graphicData.Signal.Model {
+    return this.data.mt;
+  }
+  set mt(v: graphicData.Signal.Model) {
+    this.data.mt = v;
+  }
   clone(): SignalData {
     return new SignalData(this.data.cloneMessage());
   }
diff --git a/src/graphics/signal/Signal.ts b/src/graphics/signal/Signal.ts
index b1fec77..6fdd3cf 100644
--- a/src/graphics/signal/Signal.ts
+++ b/src/graphics/signal/Signal.ts
@@ -18,6 +18,7 @@ import {
 import { SignalCode } from './SignalCode';
 import { Section, SectionPort, SectionType } from '../section/Section';
 import { Turnout, TurnoutPort } from '../turnout/Turnout';
+import { graphicData } from 'src/protos/stationLayoutGraphics';
 
 export enum Direction {
   LEFT = 0,
@@ -46,6 +47,8 @@ export interface ISignalData extends GraphicData {
   set refDev(v: IRelatedRefData);
   get centralizedStations(): string[];
   set centralizedStations(v: string[]);
+  get mt(): graphicData.Signal.Model;
+  set mt(v: graphicData.Signal.Model);
   clone(): ISignalData;
   copyFrom(data: ISignalData): void;
   eq(other: ISignalData): boolean;
diff --git a/src/protos/device_state.ts b/src/protos/device_state.ts
index a90aa7a..3046ba3 100644
--- a/src/protos/device_state.ts
+++ b/src/protos/device_state.ts
@@ -2709,6 +2709,96 @@ export namespace state {
             return PsdState.deserialize(bytes);
         }
     }
+    export class KeyState extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            id?: string;
+            gear?: number;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("id" in data && data.id != undefined) {
+                    this.id = data.id;
+                }
+                if ("gear" in data && data.gear != undefined) {
+                    this.gear = data.gear;
+                }
+            }
+        }
+        get id() {
+            return pb_1.Message.getFieldWithDefault(this, 1, "") as string;
+        }
+        set id(value: string) {
+            pb_1.Message.setField(this, 1, value);
+        }
+        get gear() {
+            return pb_1.Message.getFieldWithDefault(this, 2, 0) as number;
+        }
+        set gear(value: number) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        static fromObject(data: {
+            id?: string;
+            gear?: number;
+        }): KeyState {
+            const message = new KeyState({});
+            if (data.id != null) {
+                message.id = data.id;
+            }
+            if (data.gear != null) {
+                message.gear = data.gear;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                id?: string;
+                gear?: number;
+            } = {};
+            if (this.id != null) {
+                data.id = this.id;
+            }
+            if (this.gear != null) {
+                data.gear = this.gear;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.id.length)
+                writer.writeString(1, this.id);
+            if (this.gear != 0)
+                writer.writeInt32(2, this.gear);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): KeyState {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new KeyState();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        message.id = reader.readString();
+                        break;
+                    case 2:
+                        message.gear = reader.readInt32();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): KeyState {
+            return KeyState.deserialize(bytes);
+        }
+    }
     export class VariationStatus extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
@@ -2880,9 +2970,10 @@ export namespace state {
             AlarmState?: AlarmState[];
             LightState?: LightState[];
             psdState?: PsdState[];
+            KeyState?: KeyState[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8, 9], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("trainState" in data && data.trainState != undefined) {
                     this.trainState = data.trainState;
@@ -2911,6 +3002,9 @@ export namespace state {
                 if ("psdState" in data && data.psdState != undefined) {
                     this.psdState = data.psdState;
                 }
+                if ("KeyState" in data && data.KeyState != undefined) {
+                    this.KeyState = data.KeyState;
+                }
             }
         }
         get trainState() {
@@ -2967,6 +3061,12 @@ export namespace state {
         set psdState(value: PsdState[]) {
             pb_1.Message.setRepeatedWrapperField(this, 9, value);
         }
+        get KeyState() {
+            return pb_1.Message.getRepeatedWrapperField(this, KeyState, 10) as KeyState[];
+        }
+        set KeyState(value: KeyState[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 10, value);
+        }
         static fromObject(data: {
             trainState?: ReturnType<typeof TrainState.prototype.toObject>[];
             switchState?: ReturnType<typeof SwitchState.prototype.toObject>[];
@@ -2977,6 +3077,7 @@ export namespace state {
             AlarmState?: ReturnType<typeof AlarmState.prototype.toObject>[];
             LightState?: ReturnType<typeof LightState.prototype.toObject>[];
             psdState?: ReturnType<typeof PsdState.prototype.toObject>[];
+            KeyState?: ReturnType<typeof KeyState.prototype.toObject>[];
         }): AllDevicesStatus {
             const message = new AllDevicesStatus({});
             if (data.trainState != null) {
@@ -3006,6 +3107,9 @@ export namespace state {
             if (data.psdState != null) {
                 message.psdState = data.psdState.map(item => PsdState.fromObject(item));
             }
+            if (data.KeyState != null) {
+                message.KeyState = data.KeyState.map(item => KeyState.fromObject(item));
+            }
             return message;
         }
         toObject() {
@@ -3019,6 +3123,7 @@ export namespace state {
                 AlarmState?: ReturnType<typeof AlarmState.prototype.toObject>[];
                 LightState?: ReturnType<typeof LightState.prototype.toObject>[];
                 psdState?: ReturnType<typeof PsdState.prototype.toObject>[];
+                KeyState?: ReturnType<typeof KeyState.prototype.toObject>[];
             } = {};
             if (this.trainState != null) {
                 data.trainState = this.trainState.map((item: TrainState) => item.toObject());
@@ -3047,6 +3152,9 @@ export namespace state {
             if (this.psdState != null) {
                 data.psdState = this.psdState.map((item: PsdState) => item.toObject());
             }
+            if (this.KeyState != null) {
+                data.KeyState = this.KeyState.map((item: KeyState) => item.toObject());
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -3071,6 +3179,8 @@ export namespace state {
                 writer.writeRepeatedMessage(8, this.LightState, (item: LightState) => item.serialize(writer));
             if (this.psdState.length)
                 writer.writeRepeatedMessage(9, this.psdState, (item: PsdState) => item.serialize(writer));
+            if (this.KeyState.length)
+                writer.writeRepeatedMessage(10, this.KeyState, (item: KeyState) => item.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -3107,6 +3217,9 @@ export namespace state {
                     case 9:
                         reader.readMessage(message.psdState, () => pb_1.Message.addToRepeatedWrapperField(message, 9, PsdState.deserialize(reader), PsdState));
                         break;
+                    case 10:
+                        reader.readMessage(message.KeyState, () => pb_1.Message.addToRepeatedWrapperField(message, 10, KeyState.deserialize(reader), KeyState));
+                        break;
                     default: reader.skipField();
                 }
             }

From 06850eb38af58d2f54444b6e8a6cac94d5fcb756 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 20 Oct 2023 14:36:56 +0800
Subject: [PATCH 11/22] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=9B=B2=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Simulation.ts                         |  18 ++
 .../line-app/infos/TrainInfoEcharts.vue       | 204 ++++++++++++++++--
 2 files changed, 207 insertions(+), 15 deletions(-)

diff --git a/src/api/Simulation.ts b/src/api/Simulation.ts
index 885fa43..a41bae6 100644
--- a/src/api/Simulation.ts
+++ b/src/api/Simulation.ts
@@ -137,6 +137,24 @@ export async function setRelayState(data: {
   return await api.post(`${UriBase}/relay/operation`, data);
 }
 
+interface KilometerRange {
+  Coordinate: string;
+  MinCoordinate: number;
+  MaxCoordinate: number;
+}
+
+/**
+ * 获取地图公里标范围
+ * @param
+ * @returns
+ */
+export async function getMapKilometerRange(
+  id: string
+): Promise<KilometerRange> {
+  const response = await api.get(`${UriBase}/${id}/getMapKilometerRange`);
+  return response.data;
+}
+
 /**
  * PSL操作
  */
diff --git a/src/components/line-app/infos/TrainInfoEcharts.vue b/src/components/line-app/infos/TrainInfoEcharts.vue
index d9a6ab7..cefc178 100644
--- a/src/components/line-app/infos/TrainInfoEcharts.vue
+++ b/src/components/line-app/infos/TrainInfoEcharts.vue
@@ -3,39 +3,52 @@
     seamless
     title="列车属性曲线图"
     @show="onDialogShow"
-    :height="510"
+    :height="546"
     :width="710"
   >
-    <div style="height: 510px; width: 710px">
+    <div class="overflow-hidden">
+      <q-tabs v-model="tab" dense align="left" @update:model-value="changeTab">
+        <q-tab name="time" label="时间" />
+        <q-tab name="km" label="公里标" />
+      </q-tabs>
+      <q-separator />
       <div
         id="train-echarts"
-        class="overflow-hidden"
-        style="height: 100%; width: 100%"
+        class="q-pa-sm overflow-hidden"
+        style="height: 510px; width: 710px"
       ></div>
     </div>
   </DraggableDialog>
 </template>
 
 <script setup lang="ts">
-import { watch } from 'vue';
+import { ref, watch } from 'vue';
 import { useLineStore } from 'src/stores/line-store';
 import DraggableDialog from 'src/components/common/DraggableDialog.vue';
 import * as echarts from 'echarts';
 import 'default-passive-events';
 import { date } from 'quasar';
+import { getMapKilometerRange } from 'src/api/Simulation';
 
 const lineStore = useLineStore();
 
+const tab = ref('time');
+
 let speedList: [Date, number][] = [];
 let accelerationList: [Date, number][] = [];
 let tractionForceList: [Date, number][] = [];
 let brakeForceList: [Date, number][] = [];
+let kmList: number[] = [];
+let km_speedList: [number, number][] = [];
+let maxKm: number;
+let minKm: number;
 
 const props = defineProps<{
   trainId: string;
 }>();
 
 function onDialogShow() {
+  getKilometerRange();
   if (props.trainId) {
     getDataList();
     initEcharts();
@@ -47,6 +60,8 @@ function getDataList() {
   accelerationList = [];
   tractionForceList = [];
   brakeForceList = [];
+  kmList = [];
+  km_speedList = [];
   lineStore.trainStateMap.forEach((list, key) => {
     const find = list.find((ii) => {
       return ii.id == props.trainId;
@@ -56,11 +71,18 @@ function getDataList() {
       accelerationList.push([key, find.dynamicState.acceleration]);
       tractionForceList.push([key, find.vobcState.tractionForce / 100]);
       brakeForceList.push([key, find.vobcState.brakeForce / 100]);
+      if (!kmList.includes(find.trainKilometer)) {
+        kmList.push(find.trainKilometer);
+        km_speedList.push([find.trainKilometer, find.dynamicState.speed / 100]);
+      }
     }
   });
 }
 
-let series = [
+type SeriesObj = echarts.SeriesOption & {
+  unit?: string;
+};
+let series: SeriesObj[] = [
   {
     name: '速度',
     type: 'line',
@@ -72,6 +94,7 @@ let series = [
     name: '加速度',
     type: 'line',
     showSymbol: false,
+    yAxisIndex: 1,
     data: accelerationList,
     unit: 'm/s',
   },
@@ -90,6 +113,32 @@ let series = [
     unit: 'kn',
   },
 ];
+let km_series: SeriesObj[] = [
+  {
+    name: '速度',
+    type: 'line',
+    showSymbol: false,
+    data: km_speedList,
+    unit: 'km/h',
+  },
+];
+
+function trainKilometerFormat(v: number) {
+  const f = v.toFixed();
+  const r = f.split('').reverse();
+  const x = r.slice(0, 3).reverse();
+  const m = r.slice(3, 6).reverse();
+  const k = r.slice(6).reverse();
+  let n = '';
+  if (k.length) {
+    n = `k${k.join('')}+${m.join('')}.${x.join('')}`;
+  } else if (m.length) {
+    n = `${m.join('')}.${x.join('')}`;
+  } else if (x.length) {
+    n = `0.${x.join('')}`;
+  }
+  return n;
+}
 
 let myChart: echarts.EChartsType;
 function initEcharts() {
@@ -99,7 +148,8 @@ function initEcharts() {
     renderer: 'canvas',
     useDirtyRect: false,
   });
-  const option = {
+  let option: echarts.EChartsOption = {
+    animation: false,
     title: {
       text: '',
     },
@@ -139,6 +189,7 @@ function initEcharts() {
               `;
         // eslint-disable-next-line
         params.forEach((item: any, index: number) => {
+          let val = item.value[1].toFixed(2);
           result +=
             "<div style='height: 28px;line-height:28px'>" +
             '<span style="display:inline-block;margin-right:5px;border-radius:20px;width:10px;height:10px;background-color:' +
@@ -147,7 +198,7 @@ function initEcharts() {
             item.seriesName +
             ' : ' +
             '<span style="float:right;margin-left:20px;font-size:14px;color:#666;font-weight:bold">' +
-            item.value[1].toFixed(2) +
+            val +
             ' ' +
             series[index].unit +
             '</span>' +
@@ -169,13 +220,106 @@ function initEcharts() {
         show: false,
       },
     },
-    yAxis: {
-      type: 'value',
-      boundaryGap: [0, '100%'],
-    },
+    yAxis: [
+      {
+        type: 'value',
+        // max: 100,
+        boundaryGap: [0, 0.1],
+      },
+      {
+        type: 'value',
+        scale: true,
+        name: '加速度 m/s',
+        boundaryGap: [0, 0.4],
+      },
+    ],
     series: series,
   };
-
+  if (tab.value == 'km') {
+    option = {
+      animation: false,
+      title: {
+        text: '',
+      },
+      tooltip: {
+        trigger: 'axis',
+        // eslint-disable-next-line
+        formatter: function (params: any) {
+          const title = trainKilometerFormat(params[0].value[0]);
+          let result = `<div
+                    style="height:100%;
+                    min-height:${30 + 28 * params.length}px;
+                    width: 200px;
+                    background: rgba(255, 255, 255, 0.27);
+                    "
+                  >
+                  <div
+                    style="width: 100%;
+                      height: 30px;
+                      padding-left:10px;
+                      font-size: 14px;
+                      line-height: 30px;
+                    "
+                  >
+                    ${title}
+                  </div>
+                  <div
+                    style="
+                        height: 100%;
+                        padding-left:10px;
+                        width: 100%;
+                        border-radius: 3px;
+                    "
+                  >
+                `;
+          // eslint-disable-next-line
+          params.forEach((item: any, index: number) => {
+            let val = item.value[1].toFixed(2);
+            result +=
+              "<div style='height: 28px;line-height:28px'>" +
+              '<span style="display:inline-block;margin-right:5px;border-radius:20px;width:10px;height:10px;background-color:' +
+              item.color +
+              '"></span>' +
+              item.seriesName +
+              ' : ' +
+              '<span style="float:right;margin-left:20px;font-size:14px;color:#666;font-weight:bold">' +
+              val +
+              ' ' +
+              km_series[index].unit +
+              '</span>' +
+              '<div style="clear:both"></div>' +
+              '</div>';
+          });
+          result += '</div>';
+          return result;
+        },
+      },
+      legend: {
+        data: ['速度'],
+      },
+      xAxis: {
+        type: 'value',
+        min: minKm,
+        max: maxKm,
+        splitLine: {
+          show: false,
+        },
+      },
+      yAxis: [
+        {
+          type: 'value',
+          max: 100,
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+      ],
+      series: km_series,
+    };
+  }
   myChart.setOption(option);
 }
 
@@ -183,7 +327,7 @@ watch(
   () => lineStore.socketStates,
   () => {
     getDataList();
-    myChart?.setOption({
+    let op: echarts.EChartsOption = {
       series: [
         {
           data: speedList,
@@ -198,8 +342,38 @@ watch(
           data: brakeForceList,
         },
       ],
-    });
+    };
+    if (tab.value == 'km') {
+      op = {
+        series: [
+          {
+            data: km_speedList,
+          },
+        ],
+      };
+    }
+    myChart?.setOption(op);
   }
 );
+
+function changeTab() {
+  myChart.dispose();
+  initEcharts();
+}
+
+function getKilometerRange() {
+  if (lineStore.simulationId) {
+    getMapKilometerRange(lineStore.simulationId)
+      .then((res) => {
+        console.log(res);
+        const d = (res.MaxCoordinate - res.MinCoordinate) * 0.05;
+        maxKm = res.MaxCoordinate + d;
+        minKm = res.MinCoordinate - d;
+      })
+      .catch((err) => {
+        console.log(err);
+      });
+  }
+}
 </script>
 <style scoped></style>

From 0ca8662b0b7dfcf15a1ffa42654ffc5c56edaa0b Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 20 Oct 2023 15:53:58 +0800
Subject: [PATCH 12/22] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/lineScene.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/drawApp/lineScene.ts b/src/drawApp/lineScene.ts
index 613a315..d28efb1 100644
--- a/src/drawApp/lineScene.ts
+++ b/src/drawApp/lineScene.ts
@@ -182,6 +182,9 @@ export const layerList = [
 export function initLineScene(lineApp: IGraphicApp, sceneName: string) {
   const options: GraphicAppOptions = {
     dataLoader: loadLineDatas,
+  };
+  const lineScene = lineApp.initScene(sceneName, options);
+  lineScene.setOptions({
     mouseToolOptions: {
       boxSelect: false,
       viewportDrag: true,
@@ -197,8 +200,7 @@ export function initLineScene(lineApp: IGraphicApp, sceneName: string) {
       Section.Type,
       Transponder.Type,
     ],
-  };
-  const lineScene = lineApp.initScene(sceneName, options);
+  });
   const categoryType = useLineStore().categoryType;
   if (!categoryType) {
     throw new Error('未获取到厂商信息');

From 3bf6e09acb5a97f2861c14f49715efd2f98d4d4e Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 20 Oct 2023 16:04:27 +0800
Subject: [PATCH 13/22] =?UTF-8?q?psl=E6=8C=89=E9=92=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/psl-store.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/stores/psl-store.ts b/src/stores/psl-store.ts
index e8d3a57..aee55e8 100644
--- a/src/stores/psl-store.ts
+++ b/src/stores/psl-store.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia';
 import { initPslScene } from 'src/drawApp/pslScene';
 import { getLineApp } from 'src/drawApp/lineApp';
+import { GraphicApp } from 'src/jl-graphic/app/JlGraphicApp';
 
 export const usePslStore = defineStore('psl', {
   state: () => ({
@@ -10,10 +11,12 @@ export const usePslStore = defineStore('psl', {
   }),
   actions: {
     getPslScene() {
-      const lineApp = getLineApp();
+      const lineApp = getLineApp() as GraphicApp;
       if (!lineApp) return;
-      const pslScene = initPslScene(lineApp, 'psl');
-      return pslScene;
+      if (lineApp.scenes.get('psl')) {
+        return lineApp.getScene('psl');
+      }
+      return initPslScene(lineApp, 'psl');
     },
     setPslParam(gatedBoxId: string, pslMapCode: string) {
       this.gatedBoxId = gatedBoxId;

From 6fd7e6191e6919a128ec42199f0a4b579240be92 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Fri, 20 Oct 2023 16:16:54 +0800
Subject: [PATCH 14/22] =?UTF-8?q?psl=E6=8C=89=E4=B8=8B=E6=8A=AC=E8=B5=B7?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/graphics/PslButtonInteraction.ts | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/drawApp/graphics/PslButtonInteraction.ts b/src/drawApp/graphics/PslButtonInteraction.ts
index 2795dab..6526ff9 100644
--- a/src/drawApp/graphics/PslButtonInteraction.ts
+++ b/src/drawApp/graphics/PslButtonInteraction.ts
@@ -159,9 +159,14 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
       mapId,
       buttonCode: pslButton.datas.code,
       gateBoxId: gateBoxId,
-      down: true,
-    }).catch((err) => {
-      errorNotify('操作失败', { message: err.origin.response.data.title });
-    });
+      down: !pslButton.states.down,
+    })
+      .then(() => {
+        pslButton.states.down = !pslButton.states.down;
+        pslButton.doRepaint();
+      })
+      .catch((err) => {
+        errorNotify('操作失败', { message: err.origin.response.data.title });
+      });
   }
 }

From 565900536afaece54ba107c863a2fef31b9100f9 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 20 Oct 2023 17:33:30 +0800
Subject: [PATCH 15/22] =?UTF-8?q?=E6=89=93=E5=8C=85=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json             |  2 ++
 quasar.config.js         |  4 ++++
 src/configs/UrlManage.ts | 31 +++++++++++++++++++++++--------
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a6cd46f..3198a09 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,8 @@
     "test": "echo \"No test specified\" && exit 0",
     "dev": "quasar dev",
     "build": "quasar build",
+    "build:test": "set NODE_ENV=test&&quasar build",
+    "build:publish": "set NODE_ENV=publish&&quasar build",
     "protoc": "node scripts/proto.cjs",
     "sync": "node scripts/sync.cjs"
   },
diff --git a/quasar.config.js b/quasar.config.js
index 3f02c23..7973526 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -52,6 +52,10 @@ module.exports = configure(function (/* ctx */) {
 
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#build
     build: {
+      env: {
+        // test:测试服务器；publish：正式服务器；其他本地
+        ENV_MODE: process.env.NODE_ENV,
+      },
       target: {
         browser: ['es2019', 'edge88', 'firefox78', 'chrome87', 'safari13.1'],
         node: 'node16',
diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts
index 73b2dcd..48def03 100644
--- a/src/configs/UrlManage.ts
+++ b/src/configs/UrlManage.ts
@@ -1,4 +1,9 @@
 function getHost(): string {
+  if (process.env.ENV_MODE == 'test') {
+    return 'test.joylink.club/bjrtss-server';
+  } else if (process.env.ENV_MODE == 'publish') {
+    return 'joylink.club/bjrtss-server';
+  }
   // return '192.168.3.7:9091';
   // return '192.168.3.47:9091';
   // return '192.168.3.37:9091';
@@ -6,18 +11,28 @@ function getHost(): string {
   // return '192.168.3.5:9091';
   // return '192.168.3.37:9091';
   return '192.168.3.233:9091';
-  // return 'test.joylink.club/bjrtss-server';
 }
 
 export function getHttpBase() {
-  return `http://${getHost()}`;
-  // return `https://${getHost()}`;
+  let protocol = 'http';
+  if (['test', 'publish'].includes(process.env.ENV_MODE as string)) {
+    protocol = 'https';
+  }
+  return `${protocol}://${getHost()}`;
 }
 
 export function getWebsocketUrl() {
-  const host = '192.168.3.233';
-  const port = 8000;
-  // return `ws://${host}/ws-bj`;
-  return `ws://${host}:${port}/connection/websocket`;
-  // return `wss://${getHost()}/ws-bj`;
+  let protocol = 'ws';
+  let host = '192.168.3.233';
+  let port = '8000';
+  if (process.env.ENV_MODE == 'test') {
+    protocol = 'wss';
+    host = 'test.joylink.club/bjrtss-server';
+    port = '';
+  } else if (process.env.ENV_MODE == 'publish') {
+    protocol = 'wss';
+    host = 'joylink.club/bjrtss-server';
+    port = '';
+  }
+  return `${protocol}://${host}:${port}/connection/websocket`;
 }

From c5e186911a76535ff95b3b3beda48f8feede8f48 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 20 Oct 2023 17:50:22 +0800
Subject: [PATCH 16/22] =?UTF-8?q?=E5=85=AC=E9=87=8C=E6=A0=87=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/DrawLayout.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue
index 7a85343..69c7db1 100644
--- a/src/layouts/DrawLayout.vue
+++ b/src/layouts/DrawLayout.vue
@@ -36,12 +36,6 @@
             </template>
           </q-btn-toggle>
         </q-toolbar-title>
-        <q-btn
-          color="orange"
-          label="公里标转换"
-          style="margin-right: 10px"
-          @click="openkilometerConvertList"
-        />
         <q-btn square color="purple" style="margin-right: 10px" icon="search">
           <q-popup-edit
             ref="popupEdit"
@@ -76,6 +70,11 @@
                 <q-item-label>关联设备列表</q-item-label>
               </q-item-section>
             </q-item>
+            <q-item clickable v-close-popup @click="openkilometerConvertList">
+              <q-item-section>
+                <q-item-label>公里标转换</q-item-label>
+              </q-item-section>
+            </q-item>
           </q-list>
         </q-btn-dropdown>
         <q-btn color="info" label="返回" @click="backConfirm" />

From 3e8da3eec056281542fb27149b847f63afaa53d6 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 23 Oct 2023 11:04:36 +0800
Subject: [PATCH 17/22] =?UTF-8?q?psl=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/drawApp/graphics/PslButtonInteraction.ts | 59 ++++++++++++--------
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/drawApp/graphics/PslButtonInteraction.ts b/src/drawApp/graphics/PslButtonInteraction.ts
index 6526ff9..60af0ff 100644
--- a/src/drawApp/graphics/PslButtonInteraction.ts
+++ b/src/drawApp/graphics/PslButtonInteraction.ts
@@ -116,36 +116,27 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
     g.eventMode = 'static';
     g.cursor = 'pointer';
     g.selectable = true;
-    // g.on('mousedown', this.onMouseDown, this);
+    g.on('mousedown', this.onMouseDown, this);
     g.on('mouseup', this.onMouseUp, this);
+    g.on('mouseout', this.onMouseOut, this);
   }
 
   unbind(g: PslButton): void {
     g.selectable = false;
     g.eventMode = 'none';
-    // g.off('mousedown', this.onMouseDown, this);
+    g.off('mousedown', this.onMouseDown, this);
     g.on('mouseup', this.onMouseUp, this);
+    g.on('mouseout', this.onMouseOut, this);
   }
-  // onMouseDown(e: FederatedMouseEvent) {
-  //   const simulationId = useLineStore().simulationId;
-  //   const mapId = useLineStore().mapId;
-  //   const gateBoxId = usePslStore().gatedBoxId;
-  //   const target = e.target as DisplayObject;
-  //   const pslButton = target.getGraphic() as PslButton;
-  //   if (!simulationId || !mapId) {
-  //     return;
-  //   }
-  //   pslOperate({
-  //     simulationId,
-  //     mapId,
-  //     buttonCode: pslButton.datas.code,
-  //     gateBoxId: gateBoxId,
-  //     down: true,
-  //   }).catch((err) => {
-  //     errorNotify('操作失败', { message: err.origin.response.data.title });
-  //   });
-  // }
-  onMouseUp(e: FederatedMouseEvent) {
+  onMouseOut(e: FederatedMouseEvent) {
+    const target = e.target as DisplayObject;
+    const pslButton = target.getGraphic() as PslButton;
+    if (pslButton.states.down && pslButton.datas.isSelfReset) {
+      pslButton.states.down = false;
+      pslButton.doRepaint();
+    }
+  }
+  onMouseDown(e: FederatedMouseEvent) {
     const simulationId = useLineStore().simulationId;
     const mapId = useLineStore().mapId;
     const gateBoxId = usePslStore().gatedBoxId;
@@ -169,4 +160,28 @@ export class PslButtonOperateInteraction extends GraphicInteractionPlugin<PslBut
         errorNotify('操作失败', { message: err.origin.response.data.title });
       });
   }
+  onMouseUp(e: FederatedMouseEvent) {
+    const simulationId = useLineStore().simulationId;
+    const mapId = useLineStore().mapId;
+    const gateBoxId = usePslStore().gatedBoxId;
+    const target = e.target as DisplayObject;
+    const pslButton = target.getGraphic() as PslButton;
+    if (!simulationId || !mapId || !pslButton.datas.isSelfReset) {
+      return;
+    }
+    pslOperate({
+      simulationId,
+      mapId,
+      buttonCode: pslButton.datas.code,
+      gateBoxId: gateBoxId,
+      down: false,
+    })
+      .then(() => {
+        pslButton.states.down = false;
+        pslButton.doRepaint();
+      })
+      .catch((err) => {
+        errorNotify('操作失败', { message: err.origin.response.data.title });
+      });
+  }
 }

From 4d4169a6e6c83beea8a8326347514659c4c53fe4 Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 23 Oct 2023 13:33:10 +0800
Subject: [PATCH 18/22] =?UTF-8?q?=E9=97=A8=E6=8E=A7=E7=AE=B1spks=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/graphics/gatedBox/GatedBox.ts     | 12 +++++++++++-
 src/graphics/spksSwitch/SpksSwitch.ts | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/graphics/gatedBox/GatedBox.ts b/src/graphics/gatedBox/GatedBox.ts
index e556d01..01195c0 100644
--- a/src/graphics/gatedBox/GatedBox.ts
+++ b/src/graphics/gatedBox/GatedBox.ts
@@ -59,8 +59,18 @@ export class GatedBox extends JlGraphic {
     codeGraph.text = this.datas.code;
     codeGraph.style.fill = gatedBoxConsts.codeColor;
     codeGraph.setVectorFontSize(gatedBoxConsts.codeFontSize);
+    const codeTransform = this.datas?.childTransforms?.find(
+      (item) => item.name === 'gated_box_code'
+    );
+    if (codeTransform) {
+      const position = codeTransform?.transform.position;
+      const rotation = codeTransform?.transform?.rotation;
+      codeGraph.position.set(position?.x, position?.y);
+      codeGraph.rotation = rotation || 0;
+    } else {
+      codeGraph.position.set(20, 0);
+    }
     codeGraph.anchor.set(0.5);
-    codeGraph.position.set(20, 0);
     this.textGraph.style.fill = gatedBoxConsts.codeColor;
     this.textGraph.setVectorFontSize(gatedBoxConsts.codeFontSize);
     this.textGraph.anchor.set(0.5);
diff --git a/src/graphics/spksSwitch/SpksSwitch.ts b/src/graphics/spksSwitch/SpksSwitch.ts
index 6bb43f9..0af4b06 100644
--- a/src/graphics/spksSwitch/SpksSwitch.ts
+++ b/src/graphics/spksSwitch/SpksSwitch.ts
@@ -59,8 +59,18 @@ export class SpksSwitch extends JlGraphic {
     codeGraph.text = this.datas.code;
     codeGraph.style.fill = spksSwitchConsts.codeColor;
     codeGraph.setVectorFontSize(spksSwitchConsts.codeFontSize);
+    const codeTransform = this.datas?.childTransforms?.find(
+      (item) => item.name === 'spks_switch_code'
+    );
+    if (codeTransform) {
+      const position = codeTransform?.transform.position;
+      const rotation = codeTransform?.transform?.rotation;
+      codeGraph.position.set(position?.x, position?.y);
+      codeGraph.rotation = rotation || 0;
+    } else {
+      codeGraph.position.set(20, 0);
+    }
     codeGraph.anchor.set(0.5);
-    codeGraph.position.set(20, 0);
     this.textGraph.style.fill = spksSwitchConsts.codeColor;
     this.textGraph.setVectorFontSize(spksSwitchConsts.codeFontSize);
     this.textGraph.anchor.set(0.5);

From b5794cd8546569b8cba8ed3a19f2a76f681cdbaf Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Mon, 23 Oct 2023 14:09:15 +0800
Subject: [PATCH 19/22] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=9B=86=E4=B8=AD=E7=AB=99=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../properties/multipleSelectProperty.vue     | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/components/draw-app/properties/multipleSelectProperty.vue b/src/components/draw-app/properties/multipleSelectProperty.vue
index ce2e95d..9cefd1c 100644
--- a/src/components/draw-app/properties/multipleSelectProperty.vue
+++ b/src/components/draw-app/properties/multipleSelectProperty.vue
@@ -54,28 +54,38 @@ function addCentralizedStation() {
         if (device.type === Section.Type) {
           const data = new SectionData();
           data.copyFrom(device.saveData());
-          data.centralizedStations.push(stationName.value);
-          device.updateData(data);
+          if (!data.centralizedStations.includes(stationName.value)) {
+            data.centralizedStations.push(stationName.value);
+            device.updateData(data);
+          }
         } else if (device.type === Signal.Type) {
           const data = new SignalData();
           data.copyFrom(device.saveData());
-          data.centralizedStations.push(stationName.value);
-          device.updateData(data);
+          if (!data.centralizedStations.includes(stationName.value)) {
+            data.centralizedStations.push(stationName.value);
+            device.updateData(data);
+          }
         } else if (device.type === Turnout.Type) {
           const data = new TurnoutData();
           data.copyFrom(device.saveData());
-          data.centralizedStations.push(stationName.value);
-          device.updateData(data);
+          if (!data.centralizedStations.includes(stationName.value)) {
+            data.centralizedStations.push(stationName.value);
+            device.updateData(data);
+          }
         } else if (device.type === AxleCounting.Type) {
           const data = new AxleCountingData();
           data.copyFrom(device.saveData());
-          data.centralizedStations.push(stationName.value);
-          device.updateData(data);
+          if (!data.centralizedStations.includes(stationName.value)) {
+            data.centralizedStations.push(stationName.value);
+            device.updateData(data);
+          }
         } else if (device.type === Transponder.Type) {
           const data = new TransponderData();
           data.copyFrom(device.saveData());
-          data.centralizedStations.push(stationName.value);
-          device.updateData(data);
+          if (!data.centralizedStations.includes(stationName.value)) {
+            data.centralizedStations.push(stationName.value);
+            device.updateData(data);
+          }
         }
       });
       stationName.value = '';

From 40061eef034aec4cfbdb3d71d59047bd60df565a Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 23 Oct 2023 16:13:45 +0800
Subject: [PATCH 20/22] =?UTF-8?q?=E5=88=97=E8=BD=A6=E6=9B=B2=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../line-app/infos/TrainInfoEcharts.vue       | 66 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/components/line-app/infos/TrainInfoEcharts.vue b/src/components/line-app/infos/TrainInfoEcharts.vue
index cefc178..c766e51 100644
--- a/src/components/line-app/infos/TrainInfoEcharts.vue
+++ b/src/components/line-app/infos/TrainInfoEcharts.vue
@@ -40,6 +40,9 @@ let tractionForceList: [Date, number][] = [];
 let brakeForceList: [Date, number][] = [];
 let kmList: number[] = [];
 let km_speedList: [number, number][] = [];
+let km_accelerationList: [number, number][] = [];
+let km_tractionForceList: [number, number][] = [];
+let km_brakeForceList: [number, number][] = [];
 let maxKm: number;
 let minKm: number;
 
@@ -62,6 +65,9 @@ function getDataList() {
   brakeForceList = [];
   kmList = [];
   km_speedList = [];
+  km_accelerationList = [];
+  km_tractionForceList = [];
+  km_brakeForceList = [];
   lineStore.trainStateMap.forEach((list, key) => {
     const find = list.find((ii) => {
       return ii.id == props.trainId;
@@ -74,6 +80,18 @@ function getDataList() {
       if (!kmList.includes(find.trainKilometer)) {
         kmList.push(find.trainKilometer);
         km_speedList.push([find.trainKilometer, find.dynamicState.speed / 100]);
+        km_accelerationList.push([
+          find.trainKilometer,
+          find.dynamicState.acceleration,
+        ]);
+        km_tractionForceList.push([
+          find.trainKilometer,
+          find.vobcState.tractionForce / 100,
+        ]);
+        km_brakeForceList.push([
+          find.trainKilometer,
+          find.vobcState.brakeForce / 100,
+        ]);
       }
     }
   });
@@ -121,6 +139,28 @@ let km_series: SeriesObj[] = [
     data: km_speedList,
     unit: 'km/h',
   },
+  {
+    name: '加速度',
+    type: 'line',
+    showSymbol: false,
+    yAxisIndex: 1,
+    data: km_accelerationList,
+    unit: 'm/s',
+  },
+  {
+    name: '牵引力',
+    type: 'line',
+    showSymbol: false,
+    data: km_tractionForceList,
+    unit: 'kn',
+  },
+  {
+    name: '制动力',
+    type: 'line',
+    showSymbol: false,
+    data: brakeForceList,
+    unit: 'kn',
+  },
 ];
 
 function trainKilometerFormat(v: number) {
@@ -295,7 +335,7 @@ function initEcharts() {
         },
       },
       legend: {
-        data: ['速度'],
+        data: ['速度', '加速度', '牵引力', '制动力'],
       },
       xAxis: {
         type: 'value',
@@ -308,13 +348,26 @@ function initEcharts() {
       yAxis: [
         {
           type: 'value',
-          max: 100,
+          // max: 100,
           axisLine: {
             show: false,
           },
           axisTick: {
             show: false,
           },
+          boundaryGap: [0, 0.1],
+        },
+        {
+          type: 'value',
+          scale: true,
+          name: '加速度 m/s',
+          axisLine: {
+            show: false,
+          },
+          axisTick: {
+            show: false,
+          },
+          boundaryGap: [0, 0.4],
         },
       ],
       series: km_series,
@@ -349,6 +402,15 @@ watch(
           {
             data: km_speedList,
           },
+          {
+            data: km_accelerationList,
+          },
+          {
+            data: km_tractionForceList,
+          },
+          {
+            data: km_brakeForceList,
+          },
         ],
       };
     }

From c9c2478fcd754f4a6c9d8b8c2332bc8d9fd5fc23 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 23 Oct 2023 16:15:51 +0800
Subject: [PATCH 21/22] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/LineLayout.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/layouts/LineLayout.vue b/src/layouts/LineLayout.vue
index d09ceb8..36be66b 100644
--- a/src/layouts/LineLayout.vue
+++ b/src/layouts/LineLayout.vue
@@ -174,6 +174,11 @@ onMounted(async () => {
         }
         lineStore.addAllScene(projectInfo.mapInfoLinks || []);
       }
+      lineStore.setSceneName(sceneName);
+      scene = lineApp.getScene(sceneName);
+      scene.bindDom(dom);
+      scene.reload();
+      onResize();
     } catch (e) {
       const error = e as ApiError;
       $q.notify({
@@ -181,11 +186,6 @@ onMounted(async () => {
         message: error.title,
       });
     }
-    lineStore.setSceneName(sceneName);
-    scene = lineApp.getScene(sceneName);
-    scene.bindDom(dom);
-    scene.reload();
-    onResize();
   } else {
     lineStore.setMapId(null);
     lineStore.setSimulationId(null);

From 7587264a116166b87fe130b4f24050f8f4d35e69 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 23 Oct 2023 16:33:13 +0800
Subject: [PATCH 22/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E6=9C=BA=E6=95=85=E9=9A=9C=E6=8A=A5=E8=AD=A6=E4=BB=AA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=EF=BC=8C=E7=BB=84=E5=90=88=E9=87=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=B7=BB=E5=8A=A0=E4=BF=A1=E5=8F=B7=E6=9C=BA?=
 =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=8A=A5=E8=AD=A6=E4=BB=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draw-app/DrawRelayCabinetProperties.vue   |   7 ++
 .../dialogs/DeviceRelateRelayList.vue         |   1 +
 .../draw-app/properties/RelateRelayConfig.vue |   4 +
 .../properties/SignalFaultAlarmProperty.vue   |  25 ++++
 .../SignalFaultAlarmInteraction.ts            |  46 +++++++
 src/drawApp/relayCabinetLayoutApp.ts          |  19 +++
 .../signalFaultAlarm/SignalFaultAlarm.ts      |  80 ++++++++++++
 .../SignalFaultAlarmDrawAssistant.ts          | 104 +++++++++++++++
 .../signalFaultAlarmSprites.png               | Bin 0 -> 6249 bytes
 src/layouts/RelayCabinetLayout.vue            |   2 +
 src/protos/relayCabinetLayoutGraphics.ts      | 118 +++++++++++++++++-
 src/protos/stationLayoutGraphics.ts           |   3 +-
 12 files changed, 407 insertions(+), 2 deletions(-)
 create mode 100644 src/components/draw-app/properties/SignalFaultAlarmProperty.vue
 create mode 100644 src/drawApp/relayCabinetGraphics/SignalFaultAlarmInteraction.ts
 create mode 100644 src/graphics/signalFaultAlarm/SignalFaultAlarm.ts
 create mode 100644 src/graphics/signalFaultAlarm/SignalFaultAlarmDrawAssistant.ts
 create mode 100644 src/graphics/signalFaultAlarm/signalFaultAlarmSprites.png

diff --git a/src/components/draw-app/DrawRelayCabinetProperties.vue b/src/components/draw-app/DrawRelayCabinetProperties.vue
index 678f791..8316497 100644
--- a/src/components/draw-app/DrawRelayCabinetProperties.vue
+++ b/src/components/draw-app/DrawRelayCabinetProperties.vue
@@ -27,6 +27,11 @@
               PhaseFailureProtector.Type
             "
           ></phaseFailureProtector-property>
+          <signalFaultAlarm-property
+            v-if="
+              relayCabinetStore.selectedGraphicType === SignalFaultAlarm.Type
+            "
+          ></signalFaultAlarm-property>
         </q-card-section>
       </template>
     </q-card>
@@ -41,6 +46,8 @@ import RelayProperty from './properties/RelayProperty.vue';
 import { Relay } from 'src/graphics/relay/Relay';
 import PhaseFailureProtectorProperty from './properties/PhaseFailureProtectorProperty.vue';
 import { PhaseFailureProtector } from 'src/graphics/phaseFailureProtector/PhaseFailureProtector';
+import SignalFaultAlarmProperty from './properties/SignalFaultAlarmProperty.vue';
+import { SignalFaultAlarm } from 'src/graphics/signalFaultAlarm/SignalFaultAlarm';
 import { useRelayCabinetStore } from 'src/stores/relayCabinet-store';
 
 const relayCabinetStore = useRelayCabinetStore();
diff --git a/src/components/draw-app/dialogs/DeviceRelateRelayList.vue b/src/components/draw-app/dialogs/DeviceRelateRelayList.vue
index f5ccdc2..c6d787b 100644
--- a/src/components/draw-app/dialogs/DeviceRelateRelayList.vue
+++ b/src/components/draw-app/dialogs/DeviceRelateRelayList.vue
@@ -63,6 +63,7 @@ const deviceTypeMap = {
   5: '信号机',
   6: '车站',
   7: '屏蔽门',
+  8: '信号机故障报警仪',
 };
 const columns: QTable['columns'] = [
   {
diff --git a/src/components/draw-app/properties/RelateRelayConfig.vue b/src/components/draw-app/properties/RelateRelayConfig.vue
index a1ac778..d43992b 100644
--- a/src/components/draw-app/properties/RelateRelayConfig.vue
+++ b/src/components/draw-app/properties/RelateRelayConfig.vue
@@ -133,6 +133,10 @@ const optionsType = [
   { label: '信号机', value: graphicData.RelatedRef.DeviceType.signal },
   { label: '车站', value: graphicData.RelatedRef.DeviceType.station },
   { label: '屏蔽门', value: graphicData.RelatedRef.DeviceType.ScreenDoor },
+  {
+    label: '信号机故障报警仪',
+    value: graphicData.RelatedRef.DeviceType.SignalFaultAlarm,
+  },
 ];
 
 let selectGraphic: JlGraphic[] = [];
diff --git a/src/components/draw-app/properties/SignalFaultAlarmProperty.vue b/src/components/draw-app/properties/SignalFaultAlarmProperty.vue
new file mode 100644
index 0000000..c152078
--- /dev/null
+++ b/src/components/draw-app/properties/SignalFaultAlarmProperty.vue
@@ -0,0 +1,25 @@
+<template>
+  <q-form class="q-gutter-md">
+    <q-input outlined readonly v-model="signalFaultAlarmModel.id" label="id" />
+    <q-input
+      outlined
+      v-model="signalFaultAlarmModel.code"
+      :emit-value="true"
+      @update:model-value="onUpdate"
+      label="编号"
+      lazy-rules
+    />
+  </q-form>
+</template>
+
+<script setup lang="ts">
+import { SignalFaultAlarmData } from 'src/drawApp/relayCabinetGraphics/SignalFaultAlarmInteraction';
+import { useRelayCabinetStore } from 'src/stores/relayCabinet-store';
+import { useFormData } from 'src/components/relayCabinetAppFormUtils';
+
+const relayCabinetStore = useRelayCabinetStore();
+const { data: signalFaultAlarmModel, onUpdate } = useFormData(
+  new SignalFaultAlarmData(),
+  relayCabinetStore.getDrawApp()
+);
+</script>
diff --git a/src/drawApp/relayCabinetGraphics/SignalFaultAlarmInteraction.ts b/src/drawApp/relayCabinetGraphics/SignalFaultAlarmInteraction.ts
new file mode 100644
index 0000000..2878442
--- /dev/null
+++ b/src/drawApp/relayCabinetGraphics/SignalFaultAlarmInteraction.ts
@@ -0,0 +1,46 @@
+import * as pb_1 from 'google-protobuf';
+import {
+  ISignalFaultAlarmData,
+  SignalFaultAlarm,
+} from 'src/graphics/signalFaultAlarm/SignalFaultAlarm';
+import { relayCabinetGraphicData } from 'src/protos/relayCabinetLayoutGraphics';
+import { GraphicDataBase } from '../graphics/GraphicDataBase';
+
+export class SignalFaultAlarmData
+  extends GraphicDataBase
+  implements ISignalFaultAlarmData
+{
+  constructor(data?: relayCabinetGraphicData.SignalFaultAlarm) {
+    let signalFaultAlarm;
+    if (!data) {
+      signalFaultAlarm = new relayCabinetGraphicData.SignalFaultAlarm(
+        {
+          common: GraphicDataBase.defaultCommonInfo(SignalFaultAlarm.Type),
+        }
+      );
+    } else {
+      signalFaultAlarm = data;
+    }
+    super(signalFaultAlarm);
+  }
+
+  public get data(): relayCabinetGraphicData.SignalFaultAlarm {
+    return this.getData<relayCabinetGraphicData.SignalFaultAlarm>();
+  }
+
+  get code(): string {
+    return this.data.code;
+  }
+  set code(v: string) {
+    this.data.code = v;
+  }
+  clone(): SignalFaultAlarmData {
+    return new SignalFaultAlarmData(this.data.cloneMessage());
+  }
+  copyFrom(data: SignalFaultAlarmData): void {
+    pb_1.Message.copyInto(data.data, this.data);
+  }
+  eq(other: SignalFaultAlarmData): boolean {
+    return pb_1.Message.equals(this.data, other.data);
+  }
+}
diff --git a/src/drawApp/relayCabinetLayoutApp.ts b/src/drawApp/relayCabinetLayoutApp.ts
index d423185..4a9bd00 100644
--- a/src/drawApp/relayCabinetLayoutApp.ts
+++ b/src/drawApp/relayCabinetLayoutApp.ts
@@ -33,6 +33,12 @@ import {
 } from 'src/graphics/phaseFailureProtector/PhaseFailureProtector';
 import { PhaseFailureProtectorData } from './relayCabinetGraphics/PhaseFailureProtectorInteraction';
 import { PhaseFailureProtectorDraw } from 'src/graphics/phaseFailureProtector/PhaseFailureProtectorDrawAssistant';
+import {
+  SignalFaultAlarm,
+  SignalFaultAlarmTemplate,
+} from 'src/graphics/signalFaultAlarm/SignalFaultAlarm';
+import { SignalFaultAlarmData } from './relayCabinetGraphics/SignalFaultAlarmInteraction';
+import { SignalFaultAlarmDraw } from 'src/graphics/signalFaultAlarm/SignalFaultAlarmDrawAssistant';
 
 const UndoOptions: MenuItemOptions = {
   name: '撤销',
@@ -80,6 +86,10 @@ export function initDrawApp(): IDrawApp {
     app,
     new PhaseFailureProtectorTemplate(new PhaseFailureProtectorData())
   );
+  new SignalFaultAlarmDraw(
+    app,
+    new SignalFaultAlarmTemplate(new SignalFaultAlarmData())
+  );
 
   // 画布右键菜单
   app.registerMenu(DefaultCanvasMenu);
@@ -205,6 +215,12 @@ export function saveDrawDatas(app: IDrawApp) {
         (phaseFailureProtectorData as PhaseFailureProtectorData).data
       );
     }
+    if (SignalFaultAlarm.Type === g.type) {
+      const signalFaultAlarmData = (g as SignalFaultAlarm).saveData();
+      storage.signalFaultAlarms.push(
+        (signalFaultAlarmData as SignalFaultAlarmData).data
+      );
+    }
   });
   storage.deviceRelateRelayList = refRelaysList;
   storage.combinationtypeList = combinationTypeList;
@@ -236,6 +252,9 @@ export async function loadDrawDatas(): Promise<IGraphicStorage> {
     storage.phaseFailureProtectors.forEach((phaseFailureProtector) => {
       datas.push(new PhaseFailureProtectorData(phaseFailureProtector));
     });
+    storage.signalFaultAlarms.forEach((signalFaultAlarm) => {
+      datas.push(new SignalFaultAlarmData(signalFaultAlarm));
+    });
     refRelaysList = storage.deviceRelateRelayList;
     combinationTypeList = storage.combinationtypeList;
     UniqueIdPrefix = storage.UniqueIdPrefix;
diff --git a/src/graphics/signalFaultAlarm/SignalFaultAlarm.ts b/src/graphics/signalFaultAlarm/SignalFaultAlarm.ts
new file mode 100644
index 0000000..239c8d7
--- /dev/null
+++ b/src/graphics/signalFaultAlarm/SignalFaultAlarm.ts
@@ -0,0 +1,80 @@
+import { Assets, Sprite, Texture } from 'pixi.js';
+import {
+  GraphicData,
+  JlGraphic,
+  JlGraphicTemplate,
+  VectorText,
+} from 'src/jl-graphic';
+import signalFaultAlarmSprites from './signalFaultAlarmSprites.png';
+
+export interface ISignalFaultAlarmData extends GraphicData {
+  get code(): string; // 编号
+  set code(v: string);
+  clone(): ISignalFaultAlarmData;
+  copyFrom(data: ISignalFaultAlarmData): void;
+  eq(other: ISignalFaultAlarmData): boolean;
+}
+
+export const signalFaultAlarmConsts = {
+  scaleX: 0.2,
+  scaleY: 0.2,
+};
+export class SignalFaultAlarm extends JlGraphic {
+  static Type = 'SignalFaultAlarm';
+  signalFaultAlarm: Sprite;
+  signalFaultAlarmTextures: Texture;
+  labelGraphic = new VectorText();
+
+  constructor(signalFaultAlarmTextures: Texture) {
+    super(SignalFaultAlarm.Type);
+    this.signalFaultAlarmTextures = signalFaultAlarmTextures;
+    this.signalFaultAlarm = new Sprite();
+    this.signalFaultAlarm.texture = this.signalFaultAlarmTextures;
+    this.signalFaultAlarm.anchor.set(0.5, 0.5);
+    this.signalFaultAlarm.scale.set(
+      signalFaultAlarmConsts.scaleX,
+      signalFaultAlarmConsts.scaleY
+    );
+    this.addChild(this.signalFaultAlarm);
+    this.setTextGraphic(this.labelGraphic, 'label');
+    this.addChild(this.labelGraphic);
+  }
+
+  get datas(): ISignalFaultAlarmData {
+    return this.getDatas<ISignalFaultAlarmData>();
+  }
+  doRepaint(): void {
+    this.labelGraphic.text = this.datas.code;
+    this.labelGraphic.position.set(0, 25);
+  }
+  setTextGraphic(g: VectorText, name: string) {
+    g.setVectorFontSize(10);
+    g.anchor.set(0.5);
+    g.style.fill = '#0f0';
+    g.transformSave = true;
+    g.name = name;
+  }
+}
+
+export class SignalFaultAlarmTemplate extends JlGraphicTemplate<SignalFaultAlarm> {
+  signalFaultAlarmTextures?: Texture;
+  constructor(dataTemplate: ISignalFaultAlarmData) {
+    super(SignalFaultAlarm.Type, {
+      dataTemplate,
+    });
+  }
+  new(): SignalFaultAlarm {
+    if (this.signalFaultAlarmTextures) {
+      const signalFaultAlarm = new SignalFaultAlarm(
+        this.signalFaultAlarmTextures
+      );
+      signalFaultAlarm.loadData(this.datas);
+      return signalFaultAlarm;
+    }
+    throw new Error('资源未加载/加载失败');
+  }
+  async loadAssets(): Promise<Texture> {
+    this.signalFaultAlarmTextures = await Assets.load(signalFaultAlarmSprites);
+    return this.signalFaultAlarmTextures as Texture;
+  }
+}
diff --git a/src/graphics/signalFaultAlarm/SignalFaultAlarmDrawAssistant.ts b/src/graphics/signalFaultAlarm/SignalFaultAlarmDrawAssistant.ts
new file mode 100644
index 0000000..9bcd783
--- /dev/null
+++ b/src/graphics/signalFaultAlarm/SignalFaultAlarmDrawAssistant.ts
@@ -0,0 +1,104 @@
+import { FederatedPointerEvent, Point } from 'pixi.js';
+import {
+  AbsorbableLine,
+  AbsorbablePosition,
+  GraphicDrawAssistant,
+  GraphicInteractionPlugin,
+  IDrawApp,
+  JlGraphic,
+} from 'src/jl-graphic';
+
+import {
+  ISignalFaultAlarmData,
+  SignalFaultAlarm,
+  SignalFaultAlarmTemplate,
+} from './SignalFaultAlarm';
+import { Relay } from '../relay/Relay';
+
+export interface ISignalFaultAlarmDrawOptions {
+  newData: () => ISignalFaultAlarmData;
+}
+
+export class SignalFaultAlarmDraw extends GraphicDrawAssistant<
+  SignalFaultAlarmTemplate,
+  ISignalFaultAlarmData
+> {
+  signalFaultAlarmGraphic: SignalFaultAlarm | null = null;
+
+  constructor(app: IDrawApp, template: SignalFaultAlarmTemplate) {
+    super(app, template, 'notifications_active', '信号机故障报警仪');
+    signalFaultAlarmInteraction.init(app);
+  }
+  bind(): void {
+    super.bind();
+    if (!this.signalFaultAlarmGraphic) {
+      this.signalFaultAlarmGraphic = this.graphicTemplate.new();
+      this.container.addChild(this.signalFaultAlarmGraphic);
+    }
+  }
+
+  onLeftDown(e: FederatedPointerEvent): void {
+    this.container.position.copyFrom(this.toCanvasCoordinates(e.global));
+    this.createAndStore(true);
+  }
+
+  redraw(p: Point): void {
+    this.container.position.copyFrom(p);
+  }
+  prepareData(data: ISignalFaultAlarmData): boolean {
+    data.transform = this.container.saveTransform();
+    return true;
+  }
+}
+
+/**
+ * 构建吸附位置
+ * @param polygon
+ * @returns
+ */
+function buildAbsorbablePositions(
+  signalFaultAlarmCabinet: SignalFaultAlarm
+): AbsorbablePosition[] {
+  const aps: AbsorbablePosition[] = [];
+  const relays = signalFaultAlarmCabinet.queryStore.queryByType<Relay>(
+    Relay.Type
+  );
+  const { width, height } = signalFaultAlarmCabinet.getGraphicApp().canvas;
+  relays.forEach((relay) => {
+    const ps = relay.position;
+    const xs = new AbsorbableLine({ x: 0, y: ps.y }, { x: width, y: ps.y });
+    const ys = new AbsorbableLine({ x: ps.x, y: 0 }, { x: ps.x, y: height });
+    aps.push(xs, ys);
+  });
+  return aps;
+}
+
+export class signalFaultAlarmInteraction extends GraphicInteractionPlugin<SignalFaultAlarm> {
+  static Name = 'signalFaultAlarm_transform';
+  constructor(app: IDrawApp) {
+    super(signalFaultAlarmInteraction.Name, app);
+  }
+  static init(app: IDrawApp) {
+    return new signalFaultAlarmInteraction(app);
+  }
+  filter(...grahpics: JlGraphic[]): SignalFaultAlarm[] | undefined {
+    return grahpics
+      .filter((g) => g.type === SignalFaultAlarm.Type)
+      .map((g) => g as SignalFaultAlarm);
+  }
+  bind(g: SignalFaultAlarm): void {
+    g.eventMode = 'static';
+    g.cursor = 'pointer';
+    g.on('transformstart', this.move, this);
+  }
+  unbind(g: SignalFaultAlarm): void {
+    g.eventMode = 'none';
+    g.off('transformstart', this.move, this);
+  }
+  move(): void {
+    const signalFaultAlarm = this.app.selectedGraphics[0] as SignalFaultAlarm;
+    this.app.setOptions({
+      absorbablePositions: buildAbsorbablePositions(signalFaultAlarm),
+    });
+  }
+}
diff --git a/src/graphics/signalFaultAlarm/signalFaultAlarmSprites.png b/src/graphics/signalFaultAlarm/signalFaultAlarmSprites.png
new file mode 100644
index 0000000000000000000000000000000000000000..dd8830e8ee15b9439658dc0ea7a34d104d98885f
GIT binary patch
literal 6249
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

literal 0
HcmV?d00001

diff --git a/src/layouts/RelayCabinetLayout.vue b/src/layouts/RelayCabinetLayout.vue
index fb0da20..507b222 100644
--- a/src/layouts/RelayCabinetLayout.vue
+++ b/src/layouts/RelayCabinetLayout.vue
@@ -198,6 +198,7 @@ import { DialogChainObject, useQuasar } from 'quasar';
 import { Relay } from 'src/graphics/relay/Relay';
 import { RelayCabinet } from 'src/graphics/relayCabinet/RelayCabinet';
 import { PhaseFailureProtector } from 'src/graphics/phaseFailureProtector/PhaseFailureProtector';
+import { SignalFaultAlarm } from 'src/graphics/signalFaultAlarm/SignalFaultAlarm';
 import { relayCabinetGraphicData } from 'src/protos/relayCabinetLayoutGraphics';
 
 const $q = useQuasar();
@@ -291,6 +292,7 @@ onMounted(() => {
     RelayCabinet.Type,
     Relay.Type,
     PhaseFailureProtector.Type,
+    SignalFaultAlarm.Type,
   ];
   drawAssistantsTypes.forEach((type) => {
     const drawAssistant = getDrawApp()?.getDrawAssistant(type);
diff --git a/src/protos/relayCabinetLayoutGraphics.ts b/src/protos/relayCabinetLayoutGraphics.ts
index b7b845f..5cd96d9 100644
--- a/src/protos/relayCabinetLayoutGraphics.ts
+++ b/src/protos/relayCabinetLayoutGraphics.ts
@@ -16,9 +16,10 @@ export namespace relayCabinetGraphicData {
             UniqueIdPrefix?: UniqueIdType;
             phaseFailureProtectors?: PhaseFailureProtector[];
             combinationtypeList?: Combinationtype[];
+            signalFaultAlarms?: SignalFaultAlarm[];
         }) {
             super();
-            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3, 4, 7, 8], this.#one_of_decls);
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [2, 3, 4, 7, 8, 9], this.#one_of_decls);
             if (!Array.isArray(data) && typeof data == "object") {
                 if ("canvas" in data && data.canvas != undefined) {
                     this.canvas = data.canvas;
@@ -41,6 +42,9 @@ export namespace relayCabinetGraphicData {
                 if ("combinationtypeList" in data && data.combinationtypeList != undefined) {
                     this.combinationtypeList = data.combinationtypeList;
                 }
+                if ("signalFaultAlarms" in data && data.signalFaultAlarms != undefined) {
+                    this.signalFaultAlarms = data.signalFaultAlarms;
+                }
             }
         }
         get canvas() {
@@ -91,6 +95,12 @@ export namespace relayCabinetGraphicData {
         set combinationtypeList(value: Combinationtype[]) {
             pb_1.Message.setRepeatedWrapperField(this, 8, value);
         }
+        get signalFaultAlarms() {
+            return pb_1.Message.getRepeatedWrapperField(this, SignalFaultAlarm, 9) as SignalFaultAlarm[];
+        }
+        set signalFaultAlarms(value: SignalFaultAlarm[]) {
+            pb_1.Message.setRepeatedWrapperField(this, 9, value);
+        }
         static fromObject(data: {
             canvas?: ReturnType<typeof dependency_1.graphicData.Canvas.prototype.toObject>;
             relayCabinets?: ReturnType<typeof RelayCabinet.prototype.toObject>[];
@@ -99,6 +109,7 @@ export namespace relayCabinetGraphicData {
             UniqueIdPrefix?: ReturnType<typeof UniqueIdType.prototype.toObject>;
             phaseFailureProtectors?: ReturnType<typeof PhaseFailureProtector.prototype.toObject>[];
             combinationtypeList?: ReturnType<typeof Combinationtype.prototype.toObject>[];
+            signalFaultAlarms?: ReturnType<typeof SignalFaultAlarm.prototype.toObject>[];
         }): RelayCabinetGraphicStorage {
             const message = new RelayCabinetGraphicStorage({});
             if (data.canvas != null) {
@@ -122,6 +133,9 @@ export namespace relayCabinetGraphicData {
             if (data.combinationtypeList != null) {
                 message.combinationtypeList = data.combinationtypeList.map(item => Combinationtype.fromObject(item));
             }
+            if (data.signalFaultAlarms != null) {
+                message.signalFaultAlarms = data.signalFaultAlarms.map(item => SignalFaultAlarm.fromObject(item));
+            }
             return message;
         }
         toObject() {
@@ -133,6 +147,7 @@ export namespace relayCabinetGraphicData {
                 UniqueIdPrefix?: ReturnType<typeof UniqueIdType.prototype.toObject>;
                 phaseFailureProtectors?: ReturnType<typeof PhaseFailureProtector.prototype.toObject>[];
                 combinationtypeList?: ReturnType<typeof Combinationtype.prototype.toObject>[];
+                signalFaultAlarms?: ReturnType<typeof SignalFaultAlarm.prototype.toObject>[];
             } = {};
             if (this.canvas != null) {
                 data.canvas = this.canvas.toObject();
@@ -155,6 +170,9 @@ export namespace relayCabinetGraphicData {
             if (this.combinationtypeList != null) {
                 data.combinationtypeList = this.combinationtypeList.map((item: Combinationtype) => item.toObject());
             }
+            if (this.signalFaultAlarms != null) {
+                data.signalFaultAlarms = this.signalFaultAlarms.map((item: SignalFaultAlarm) => item.toObject());
+            }
             return data;
         }
         serialize(): Uint8Array;
@@ -175,6 +193,8 @@ export namespace relayCabinetGraphicData {
                 writer.writeRepeatedMessage(7, this.phaseFailureProtectors, (item: PhaseFailureProtector) => item.serialize(writer));
             if (this.combinationtypeList.length)
                 writer.writeRepeatedMessage(8, this.combinationtypeList, (item: Combinationtype) => item.serialize(writer));
+            if (this.signalFaultAlarms.length)
+                writer.writeRepeatedMessage(9, this.signalFaultAlarms, (item: SignalFaultAlarm) => item.serialize(writer));
             if (!w)
                 return writer.getResultBuffer();
         }
@@ -205,6 +225,9 @@ export namespace relayCabinetGraphicData {
                     case 8:
                         reader.readMessage(message.combinationtypeList, () => pb_1.Message.addToRepeatedWrapperField(message, 8, Combinationtype.deserialize(reader), Combinationtype));
                         break;
+                    case 9:
+                        reader.readMessage(message.signalFaultAlarms, () => pb_1.Message.addToRepeatedWrapperField(message, 9, SignalFaultAlarm.deserialize(reader), SignalFaultAlarm));
+                        break;
                     default: reader.skipField();
                 }
             }
@@ -532,6 +555,99 @@ export namespace relayCabinetGraphicData {
             return PhaseFailureProtector.deserialize(bytes);
         }
     }
+    export class SignalFaultAlarm extends pb_1.Message {
+        #one_of_decls: number[][] = [];
+        constructor(data?: any[] | {
+            common?: dependency_1.graphicData.CommonInfo;
+            code?: string;
+        }) {
+            super();
+            pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
+            if (!Array.isArray(data) && typeof data == "object") {
+                if ("common" in data && data.common != undefined) {
+                    this.common = data.common;
+                }
+                if ("code" in data && data.code != undefined) {
+                    this.code = data.code;
+                }
+            }
+        }
+        get common() {
+            return pb_1.Message.getWrapperField(this, dependency_1.graphicData.CommonInfo, 1) as dependency_1.graphicData.CommonInfo;
+        }
+        set common(value: dependency_1.graphicData.CommonInfo) {
+            pb_1.Message.setWrapperField(this, 1, value);
+        }
+        get has_common() {
+            return pb_1.Message.getField(this, 1) != null;
+        }
+        get code() {
+            return pb_1.Message.getFieldWithDefault(this, 2, "") as string;
+        }
+        set code(value: string) {
+            pb_1.Message.setField(this, 2, value);
+        }
+        static fromObject(data: {
+            common?: ReturnType<typeof dependency_1.graphicData.CommonInfo.prototype.toObject>;
+            code?: string;
+        }): SignalFaultAlarm {
+            const message = new SignalFaultAlarm({});
+            if (data.common != null) {
+                message.common = dependency_1.graphicData.CommonInfo.fromObject(data.common);
+            }
+            if (data.code != null) {
+                message.code = data.code;
+            }
+            return message;
+        }
+        toObject() {
+            const data: {
+                common?: ReturnType<typeof dependency_1.graphicData.CommonInfo.prototype.toObject>;
+                code?: string;
+            } = {};
+            if (this.common != null) {
+                data.common = this.common.toObject();
+            }
+            if (this.code != null) {
+                data.code = this.code;
+            }
+            return data;
+        }
+        serialize(): Uint8Array;
+        serialize(w: pb_1.BinaryWriter): void;
+        serialize(w?: pb_1.BinaryWriter): Uint8Array | void {
+            const writer = w || new pb_1.BinaryWriter();
+            if (this.has_common)
+                writer.writeMessage(1, this.common, () => this.common.serialize(writer));
+            if (this.code.length)
+                writer.writeString(2, this.code);
+            if (!w)
+                return writer.getResultBuffer();
+        }
+        static deserialize(bytes: Uint8Array | pb_1.BinaryReader): SignalFaultAlarm {
+            const reader = bytes instanceof pb_1.BinaryReader ? bytes : new pb_1.BinaryReader(bytes), message = new SignalFaultAlarm();
+            while (reader.nextField()) {
+                if (reader.isEndGroup())
+                    break;
+                switch (reader.getFieldNumber()) {
+                    case 1:
+                        reader.readMessage(message.common, () => message.common = dependency_1.graphicData.CommonInfo.deserialize(reader));
+                        break;
+                    case 2:
+                        message.code = reader.readString();
+                        break;
+                    default: reader.skipField();
+                }
+            }
+            return message;
+        }
+        serializeBinary(): Uint8Array {
+            return this.serialize();
+        }
+        static deserializeBinary(bytes: Uint8Array): SignalFaultAlarm {
+            return SignalFaultAlarm.deserialize(bytes);
+        }
+    }
     export class DeviceRelateRelay extends pb_1.Message {
         #one_of_decls: number[][] = [];
         constructor(data?: any[] | {
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index c701c22..5c081bf 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -3515,7 +3515,8 @@ export namespace graphicData {
             SectionLink = 4,
             signal = 5,
             station = 6,
-            ScreenDoor = 7
+            ScreenDoor = 7,
+            SignalFaultAlarm = 8
         }
         export enum DevicePort {
             A = 0,