Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m25s

commit a474415b9d
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Fri Mar 29 18:34:36 2024 +0800

    防淹门生成继电器和关联集中站
This commit is contained in:
joylink_zhaoerwei 2024-03-29 18:39:39 +08:00
parent 737e671e15
commit b5448207ba
9 changed files with 35 additions and 2 deletions

View File

@ -68,6 +68,7 @@ const deviceTypeMap = {
10: '电源屏', 10: '电源屏',
11: '车库门', 11: '车库门',
12: '洗车机', 12: '洗车机',
13: '防淹门',
}; };
const columns: QTable['columns'] = [ const columns: QTable['columns'] = [
{ {

View File

@ -88,6 +88,7 @@ const optionsType = [
{ label: '电源屏', value: graphicData.RelatedRef.DeviceType.PowerScreen }, { label: '电源屏', value: graphicData.RelatedRef.DeviceType.PowerScreen },
{ label: '车库门', value: graphicData.RelatedRef.DeviceType.GarageDoor }, { label: '车库门', value: graphicData.RelatedRef.DeviceType.GarageDoor },
{ label: '洗车机', value: graphicData.RelatedRef.DeviceType.CarWashing }, { label: '洗车机', value: graphicData.RelatedRef.DeviceType.CarWashing },
{ label: '防淹门', value: graphicData.RelatedRef.DeviceType.FloodGate },
]; ];
const noShowType = [ const noShowType = [

View File

@ -9,7 +9,7 @@ function getHost(): string {
// return '192.168.3.7:9091'; // return '192.168.3.7:9091';
// return '192.168.3.47:9091'; // return '192.168.3.47:9091';
// return '192.168.3.37: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.33.93:9091';
// return '192.168.3.37:9091'; //卫志宏 // return '192.168.3.37:9091'; //卫志宏
// return 'test.joylink.club/bjrtsts-service'; // 测试 // return 'test.joylink.club/bjrtsts-service'; // 测试

View File

@ -16,6 +16,8 @@ import { GarageDoor } from '../garageDoor/GarageDoor';
import { CarWashing } from '../carWashing/CarWashing'; import { CarWashing } from '../carWashing/CarWashing';
import { GarageDoorData } from 'src/drawApp/graphics/GarageDoorInteraction'; import { GarageDoorData } from 'src/drawApp/graphics/GarageDoorInteraction';
import { CarWashingData } from 'src/drawApp/graphics/CarWashingInteraction'; import { CarWashingData } from 'src/drawApp/graphics/CarWashingInteraction';
import { FloodGate } from '../floodGate/FloodGate';
import { FloodGateData } from 'src/drawApp/graphics/FloodGateInteraction';
//判断线段与线段有木有交点 //判断线段与线段有木有交点
export function isSegmentsIntersect( export function isSegmentsIntersect(
@ -176,6 +178,7 @@ export function handleCentralizedStationsData(
[Transponder.Type, new TransponderData()], [Transponder.Type, new TransponderData()],
[GarageDoor.Type, new GarageDoorData()], [GarageDoor.Type, new GarageDoorData()],
[CarWashing.Type, new CarWashingData()], [CarWashing.Type, new CarWashingData()],
[FloodGate.Type, new FloodGateData()],
]); ]);
devices.forEach((device) => { devices.forEach((device) => {
const data = dataMap.get(device.type); const data = dataMap.get(device.type);

View File

@ -698,6 +698,9 @@ const garageDoorCjList = [
}, },
]; ];
//防淹门
const floodGateCjList = garageDoorCjList;
//洗车机 //洗车机
const carWashingCjList = [ const carWashingCjList = [
{ {
@ -870,4 +873,5 @@ export const ciCjMap = new Map<string, CjData[]>([
[`${DeviceType.PowerScreen}+undefined`, powerScreenCjList], [`${DeviceType.PowerScreen}+undefined`, powerScreenCjList],
[`${DeviceType.GarageDoor}+undefined`, garageDoorCjList], [`${DeviceType.GarageDoor}+undefined`, garageDoorCjList],
[`${DeviceType.CarWashing}+undefined`, carWashingCjList], [`${DeviceType.CarWashing}+undefined`, carWashingCjList],
[`${DeviceType.FloodGate}+undefined`, floodGateCjList],
]); ]);

View File

@ -103,6 +103,8 @@ const garageDoorQdList = [
}, },
]; ];
const floodGateQdList = garageDoorQdList;
const carWashingQdList = [ const carWashingQdList = [
{ {
code: 'XCJ1', code: 'XCJ1',
@ -176,4 +178,5 @@ export const ciQdMap = new Map<string, QdData[]>([
[`${DeviceType.ScreenDoor}+up`, upScreenDoorQdList], [`${DeviceType.ScreenDoor}+up`, upScreenDoorQdList],
[`${DeviceType.GarageDoor}+undefined`, garageDoorQdList], [`${DeviceType.GarageDoor}+undefined`, garageDoorQdList],
[`${DeviceType.CarWashing}+undefined`, carWashingQdList], [`${DeviceType.CarWashing}+undefined`, carWashingQdList],
[`${DeviceType.FloodGate}+undefined`, floodGateQdList],
]); ]);

View File

@ -464,6 +464,9 @@ const garageDoorCombinations = [
}, },
]; ];
//防淹门
const floodGateCombinations = garageDoorCombinations;
//洗车机 //洗车机
const carWashingCombinations = [ const carWashingCombinations = [
{ {
@ -570,4 +573,5 @@ export const combinationsMap = new Map<string, Combinationtype[]>([
[`${DeviceType.PowerScreen}`, powerScreenCombinations], [`${DeviceType.PowerScreen}`, powerScreenCombinations],
[`${DeviceType.GarageDoor}`, garageDoorCombinations], [`${DeviceType.GarageDoor}`, garageDoorCombinations],
[`${DeviceType.CarWashing}`, carWashingCombinations], [`${DeviceType.CarWashing}`, carWashingCombinations],
[`${DeviceType.FloodGate}`, floodGateCombinations],
]); ]);

View File

@ -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) => { storage.carWashings.forEach((carWashing) => {
const deviceCombinations = combinationsMap.get( const deviceCombinations = combinationsMap.get(

View File

@ -4636,7 +4636,8 @@ export namespace graphicData {
Breakers = 9, Breakers = 9,
PowerScreen = 10, PowerScreen = 10,
GarageDoor = 11, GarageDoor = 11,
CarWashing = 12 CarWashing = 12,
FloodGate = 13
} }
export enum DevicePort { export enum DevicePort {
A = 0, A = 0,