From b25fee816a4e715ebfa7f44faff6fdd1d2070eb1 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 10 Jan 2024 15:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E5=8F=B0=E8=BD=A6=E7=AB=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/drawApp/index.ts | 6 +++--- src/drawApp/lineApp.ts | 14 +++----------- src/drawApp/rangeConfigApp.ts | 14 +++----------- src/graphics/platform/Platform.ts | 4 ++-- src/graphics/station/Station.ts | 4 ++-- 6 files changed, 14 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index 168b0cd..421a048 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "dotenv": "^16.3.1", "google-protobuf": "^3.21.2", "jl-graphic": "git+https://git.code.tencent.com/jl-framework/graphic-pixi.git#v0.1.3", - "rt-graphic-component": "git+https://git.code.tencent.com/jl-framework/rt-graphic-component.git#v0.0.12", + "rt-graphic-component": "git+https://git.code.tencent.com/jl-framework/rt-graphic-component.git#8afd91f", "js-base64": "^3.7.5", "pinia": "^2.0.11", "quasar": "^2.6.0", diff --git a/src/drawApp/index.ts b/src/drawApp/index.ts index 7a6de96..6e165e9 100644 --- a/src/drawApp/index.ts +++ b/src/drawApp/index.ts @@ -40,7 +40,7 @@ import { PlatformDraw } from 'rt-graphic-component/components/packages/Platform/ import { Station } from 'src/graphics/station/Station'; import { StationData, StationState } from './graphics/StationInteraction'; import { StationTemplate } from 'rt-graphic-component/components/packages/Station/StationTemplate'; -import { CategoryType } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; +import { StyleType } from 'rt-graphic-component/components/common/common'; import { StationDraw } from 'rt-graphic-component/components/packages/Station/StationDrawAssistant'; import { StationLine, @@ -240,7 +240,7 @@ export function initDrawApp(): IDrawApp { new PlatformTemplate( new PlatformData(), new PlatformState(), - CategoryType.XiAn + StyleType.TH ), 'svguse:../../drawIcon.svg#icon-platform' ), @@ -249,7 +249,7 @@ export function initDrawApp(): IDrawApp { new StationTemplate( new StationData(), new StationState(), - CategoryType.XiAn + StyleType.TH ), 'svguse:../../drawIcon.svg#icon-station' ), diff --git a/src/drawApp/lineApp.ts b/src/drawApp/lineApp.ts index 69bb88d..c6c163b 100644 --- a/src/drawApp/lineApp.ts +++ b/src/drawApp/lineApp.ts @@ -74,7 +74,7 @@ import { import { Notify, QNotifyUpdateOptions } from 'quasar'; import { useLineNetStore } from 'src/stores/line-net-store'; import { alert } from 'src/protos/alertInfo'; -import { CategoryType } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; +import { StyleType } from 'rt-graphic-component/components/common/common'; import { StationTemplate } from 'rt-graphic-component/components/packages/Station/StationTemplate'; let lineApp: IGraphicApp | null = null; @@ -114,16 +114,8 @@ export function initLineApp(): IGraphicApp { const graphicTemplate = [ new TrainTemplate(new TrainData(), new TrainState()), new SignalTemplate(new SignalData(), new SignalState()), - new PlatformTemplate( - new PlatformData(), - new PlatformState(), - CategoryType.XiAn - ), - new StationTemplate( - new StationData(), - new StationState(), - CategoryType.XiAn - ), + new PlatformTemplate(new PlatformData(), new PlatformState(), StyleType.TH), + new StationTemplate(new StationData(), new StationState(), StyleType.TH), new TurnoutTemplate(new TurnoutData(), new TurnoutStates()), new SectionTemplate(new SectionData()), new LogicSectionTemplate(new LogicSectionData(), new LogicSectionState()), diff --git a/src/drawApp/rangeConfigApp.ts b/src/drawApp/rangeConfigApp.ts index 4c0254f..600ab9d 100644 --- a/src/drawApp/rangeConfigApp.ts +++ b/src/drawApp/rangeConfigApp.ts @@ -34,7 +34,7 @@ import { getPublishMapInfoByLineId } from 'src/api/PublishApi'; import { useRangeConfigStore } from 'src/stores/range-config-store'; import { graphicData } from 'src/protos/stationLayoutGraphics'; import { toUint8Array } from 'js-base64'; -import { CategoryType } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; +import { StyleType } from 'rt-graphic-component/components/common/common'; let rangeConfigApp: IGraphicApp; @@ -60,16 +60,8 @@ export function initRangeConfigApp(lineId: number) { }); const graphicTemplate = [ new SignalTemplate(new SignalData(), new SignalState()), - new PlatformTemplate( - new PlatformData(), - new PlatformState(), - CategoryType.XiAn - ), - new StationTemplate( - new StationData(), - new StationState(), - CategoryType.XiAn - ), + new PlatformTemplate(new PlatformData(), new PlatformState(), StyleType.TH), + new StationTemplate(new StationData(), new StationState(), StyleType.TH), new TurnoutTemplate(new TurnoutData(), new TurnoutStates()), new SectionTemplate(new SectionData()), new LogicSectionTemplate(new LogicSectionData(), new LogicSectionState()), diff --git a/src/graphics/platform/Platform.ts b/src/graphics/platform/Platform.ts index 2992e1c..ab7e92c 100644 --- a/src/graphics/platform/Platform.ts +++ b/src/graphics/platform/Platform.ts @@ -1,6 +1,6 @@ -import { XiAnPlatform as Platform } from 'rt-graphic-component/components/packages/Platform/XiAnPlatform'; +import { THPlatform as Platform } from 'rt-graphic-component/components/packages/Platform/THPlatform'; import { IPlatformData } from 'rt-graphic-component/components/packages/Platform/PlatformConfig'; -import { IXiAnPlatformState as IPlatformState } from 'rt-graphic-component/components/packages/Platform/XiAnPlatform'; +import { ITHPlatformState as IPlatformState } from 'rt-graphic-component/components/packages/Platform/THPlatform'; export { Platform }; export type { IPlatformState, IPlatformData }; diff --git a/src/graphics/station/Station.ts b/src/graphics/station/Station.ts index 4d1d8dd..0a0e5a0 100644 --- a/src/graphics/station/Station.ts +++ b/src/graphics/station/Station.ts @@ -1,6 +1,6 @@ -import { XiAnStation as Station } from 'rt-graphic-component/components/packages/Station/XiAnStation'; +import { THStation as Station } from 'rt-graphic-component/components/packages/Station/THStation'; import { IStationData } from 'rt-graphic-component/components/packages/Station/StationConfig'; -import { IXiAnStationState as IStationState } from 'rt-graphic-component/components/packages/Station/XiAnStation'; +import { ITHStationState as IStationState } from 'rt-graphic-component/components/packages/Station/THStation'; export { Station }; export type { IStationState, IStationData };