From 72bd566c6c0281515087c2bf6569a8b2c9282fd0 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Wed, 6 Dec 2023 17:00:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../properties/multipleSelectProperty.vue | 17 ++++------------- .../axleCounting/AxleCountingDrawAssistant.ts | 13 ------------- src/layouts/DrawLayout.vue | 2 -- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/components/draw-app/properties/multipleSelectProperty.vue b/src/components/draw-app/properties/multipleSelectProperty.vue index 10a62cc..6e80147 100644 --- a/src/components/draw-app/properties/multipleSelectProperty.vue +++ b/src/components/draw-app/properties/multipleSelectProperty.vue @@ -402,22 +402,13 @@ const signalTypeOptions = [ value: signalModel.HBU_DU, }, ]; -const signalTypeMap = new Map([ - [signalModel.HL, '红绿'], - [signalModel.HLU_FU, '红绿黄,封黄灯,无引导'], - [signalModel.HLU_DU_YY, '红绿黄,不封灯,有单黄,带引导'], - [signalModel.HLU_YY, '红绿黄,不封灯,无单黄,带引导'], - [signalModel.HLU_FL_DU_YY, '红绿黄,封绿灯,有单黄,带引导'], - [signalModel.HLU_DU, '红绿黄,不封灯,有单黄,无引导'], - [signalModel.AB, '蓝白'], - [signalModel.HBU_DU, '红白黄,不封灯,有单黄,无引导'], -]); function setSignalType() { if (signalType.value) { + const showType = signalTypeOptions.find( + (item) => item.value == signalType.value + )?.label; $q.dialog({ - message: `确定批量设置选中信号机的类型为【${signalTypeMap.get( - signalType.value - )}】吗?`, + message: `确定批量设置选中信号机的类型为【${showType}】吗?`, cancel: true, }).onOk(() => { drawStore.selectedGraphics?.forEach((signal) => { diff --git a/src/graphics/axleCounting/AxleCountingDrawAssistant.ts b/src/graphics/axleCounting/AxleCountingDrawAssistant.ts index bceed26..f79a162 100644 --- a/src/graphics/axleCounting/AxleCountingDrawAssistant.ts +++ b/src/graphics/axleCounting/AxleCountingDrawAssistant.ts @@ -25,19 +25,6 @@ import { graphicData } from 'src/protos/stationLayoutGraphics'; export interface IAxleCountingDrawOptions { newData: () => IAxleCountingData; } -console.log(DevicePort); - -// enum DevicePort { -// A = 0, -// B = 1, -// C = 2, -// } - -// enum DevicePortN { -// A, -// B, -// C, -// } export class AxleCountingDraw extends GraphicDrawAssistant< AxleCountingTemplate, diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue index a564156..0f517c4 100644 --- a/src/layouts/DrawLayout.vue +++ b/src/layouts/DrawLayout.vue @@ -922,7 +922,6 @@ function oneClickGenerateEsbCombinationData() { const esbButtonIds = esbButtons .filter((g) => platformIds.includes(g.datas.refStand)) .map((g) => g.id); - combinationtypes.push( new graphicData.DeviceCombinationtype({ code: refEsbRelayCodes[0], @@ -942,7 +941,6 @@ function oneClickGenerateEsbCombinationData() { ); }); } - const stationRelateDevice = new graphicData.StationRelateDevice({ deviceType: graphicData.RelatedRef.DeviceType.station, code: station.datas.stationName,