From a474415b9df2309ff4a63beff5ad67055631faf3 Mon Sep 17 00:00:00 2001 From: joylink_zhaoerwei Date: Fri, 29 Mar 2024 18:34:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=B7=B9=E9=97=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=BB=A7=E7=94=B5=E5=99=A8=E5=92=8C=E5=85=B3=E8=81=94=E9=9B=86?= =?UTF-8?q?=E4=B8=AD=E7=AB=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../draw-app/dialogs/DeviceRelateRelayList.vue | 1 + .../draw-app/properties/RelateRelayConfig.vue | 1 + src/configs/UrlManage.ts | 2 +- .../ConcentrationDividingLineUtils.ts | 3 +++ .../RelayCabinetLayout/GeneraterCiCjConfig.ts | 4 ++++ .../RelayCabinetLayout/GeneraterCiQdConfig.ts | 3 +++ .../GeneraterRelayLayoutConfig.ts | 4 ++++ .../RelayCabinetLayout/RelayCabinetLayout.vue | 16 ++++++++++++++++ src/protos/stationLayoutGraphics.ts | 3 ++- 9 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/draw-app/dialogs/DeviceRelateRelayList.vue b/src/components/draw-app/dialogs/DeviceRelateRelayList.vue index 21a1f24..b49c731 100644 --- a/src/components/draw-app/dialogs/DeviceRelateRelayList.vue +++ b/src/components/draw-app/dialogs/DeviceRelateRelayList.vue @@ -68,6 +68,7 @@ const deviceTypeMap = { 10: '电源屏', 11: '车库门', 12: '洗车机', + 13: '防淹门', }; const columns: QTable['columns'] = [ { diff --git a/src/components/draw-app/properties/RelateRelayConfig.vue b/src/components/draw-app/properties/RelateRelayConfig.vue index 73635fd..fc53996 100644 --- a/src/components/draw-app/properties/RelateRelayConfig.vue +++ b/src/components/draw-app/properties/RelateRelayConfig.vue @@ -88,6 +88,7 @@ const optionsType = [ { label: '电源屏', value: graphicData.RelatedRef.DeviceType.PowerScreen }, { label: '车库门', value: graphicData.RelatedRef.DeviceType.GarageDoor }, { label: '洗车机', value: graphicData.RelatedRef.DeviceType.CarWashing }, + { label: '防淹门', value: graphicData.RelatedRef.DeviceType.FloodGate }, ]; const noShowType = [ diff --git a/src/configs/UrlManage.ts b/src/configs/UrlManage.ts index 62d1883..c4e0f4d 100644 --- a/src/configs/UrlManage.ts +++ b/src/configs/UrlManage.ts @@ -9,7 +9,7 @@ function getHost(): string { // return '192.168.3.7:9091'; // return '192.168.3.47:9091'; // return '192.168.3.37:9091'; - return '192.168.33.207:9091'; // 张骞 + //return '192.168.33.207:9091'; // 张骞 // return '192.168.33.93:9091'; // return '192.168.3.37:9091'; //卫志宏 // return 'test.joylink.club/bjrtsts-service'; // 测试 diff --git a/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts b/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts index 2146c9b..bbffbd0 100644 --- a/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts +++ b/src/graphics/concentrationDividingLine/ConcentrationDividingLineUtils.ts @@ -16,6 +16,8 @@ import { GarageDoor } from '../garageDoor/GarageDoor'; import { CarWashing } from '../carWashing/CarWashing'; import { GarageDoorData } from 'src/drawApp/graphics/GarageDoorInteraction'; import { CarWashingData } from 'src/drawApp/graphics/CarWashingInteraction'; +import { FloodGate } from '../floodGate/FloodGate'; +import { FloodGateData } from 'src/drawApp/graphics/FloodGateInteraction'; //判断线段与线段有木有交点 export function isSegmentsIntersect( @@ -176,6 +178,7 @@ export function handleCentralizedStationsData( [Transponder.Type, new TransponderData()], [GarageDoor.Type, new GarageDoorData()], [CarWashing.Type, new CarWashingData()], + [FloodGate.Type, new FloodGateData()], ]); devices.forEach((device) => { const data = dataMap.get(device.type); diff --git a/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts index cb5224d..8e4a655 100644 --- a/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts +++ b/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts @@ -698,6 +698,9 @@ const garageDoorCjList = [ }, ]; +//防淹门 +const floodGateCjList = garageDoorCjList; + //洗车机 const carWashingCjList = [ { @@ -870,4 +873,5 @@ export const ciCjMap = new Map([ [`${DeviceType.PowerScreen}+undefined`, powerScreenCjList], [`${DeviceType.GarageDoor}+undefined`, garageDoorCjList], [`${DeviceType.CarWashing}+undefined`, carWashingCjList], + [`${DeviceType.FloodGate}+undefined`, floodGateCjList], ]); diff --git a/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts index 0b60b11..4656973 100644 --- a/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts +++ b/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts @@ -103,6 +103,8 @@ const garageDoorQdList = [ }, ]; +const floodGateQdList = garageDoorQdList; + const carWashingQdList = [ { code: 'XCJ1', @@ -176,4 +178,5 @@ export const ciQdMap = new Map([ [`${DeviceType.ScreenDoor}+up`, upScreenDoorQdList], [`${DeviceType.GarageDoor}+undefined`, garageDoorQdList], [`${DeviceType.CarWashing}+undefined`, carWashingQdList], + [`${DeviceType.FloodGate}+undefined`, floodGateQdList], ]); diff --git a/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts index 77cd90b..622acb1 100644 --- a/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts +++ b/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts @@ -464,6 +464,9 @@ const garageDoorCombinations = [ }, ]; +//防淹门 +const floodGateCombinations = garageDoorCombinations; + //洗车机 const carWashingCombinations = [ { @@ -570,4 +573,5 @@ export const combinationsMap = new Map([ [`${DeviceType.PowerScreen}`, powerScreenCombinations], [`${DeviceType.GarageDoor}`, garageDoorCombinations], [`${DeviceType.CarWashing}`, carWashingCombinations], + [`${DeviceType.FloodGate}`, floodGateCombinations], ]); diff --git a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue index 39770dc..af3529c 100644 --- a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue +++ b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue @@ -752,6 +752,22 @@ function oneClickGeneraterRelayLayout() { ); } }); + //防淹门 + storage.floodGates.forEach((floodGate) => { + const deviceCombinations = combinationsMap.get( + `${DeviceType.FloodGate}` + ); + if ( + floodGate.centralizedStations.includes(concentrationStation) && + deviceCombinations + ) { + creatDeviceRelateRelays( + deviceCombinations, + DeviceType.FloodGate, + floodGate.code + ); + } + }); //洗车机 storage.carWashings.forEach((carWashing) => { const deviceCombinations = combinationsMap.get( diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts index 50de0e4..3ff33e2 100644 --- a/src/protos/stationLayoutGraphics.ts +++ b/src/protos/stationLayoutGraphics.ts @@ -4636,7 +4636,8 @@ export namespace graphicData { Breakers = 9, PowerScreen = 10, GarageDoor = 11, - CarWashing = 12 + CarWashing = 12, + FloodGate = 13 } export enum DevicePort { A = 0,