joylink/rts-sim-testing-client
6
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

增加IBP盘扣车继电器（IKCJ）、增加GDJ（计轴电源故障继电器）和ZFWJ

Browse Source
This commit is contained in:
joylink_zhaoerwei 2024-06-24 18:35:14 +08:00
parent b7a3200560
commit ad7a1a8451
7 changed files with 132 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/draw-app/dialogs/DeviceRelateRelayList.vue
View File

@ -70,6 +70,8 @@ const deviceTypeMap = {
11: '车库门',
12: '洗车机',
13: '防淹门',
14: '站台',
15: '零散',
};
const columns: QTable['columns'] = [
{

3
src/components/draw-app/properties/RelateRelayConfig.vue
View File

@ -90,12 +90,15 @@ const optionsType = [
{ label: '洗车机', value: graphicData.RelatedRef.DeviceType.CarWashing },
{ label: '防淹门', value: graphicData.RelatedRef.DeviceType.FloodGate },
{ label: '区段', value: graphicData.RelatedRef.DeviceType.Section },
{ label: '站台', value: graphicData.RelatedRef.DeviceType.Platform },
{ label: '零散', value: graphicData.RelatedRef.DeviceType.LS },
];
const noShowType = [
graphicData.RelatedRef.DeviceType.SignalFaultAlarm,
graphicData.RelatedRef.DeviceType.Breakers,
graphicData.RelatedRef.DeviceType.PowerScreen,
graphicData.RelatedRef.DeviceType.LS,
];
onMounted(() => {

38
src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts
View File

@ -814,6 +814,42 @@ const sectionCjList = [
},
];
//IBP盘扣车继电器
const platformCjList = [
{
code: 'IKC',
refDeviceCodesAndPos: [
[
{
code: 'IKCJ',
position: PostionType.Q,
},
],
],
},
];
//GDJ（计轴电源故障继电器）ZFWJ
const LSCjList = [
{
code: 'LS',
refDeviceCodesAndPos: [
[
{
code: 'GDJ',
position: PostionType.Q,
},
],
[
{
code: 'ZFWJ',
position: PostionType.Q,
},
],
],
},
];
const DeviceType = graphicData.RelatedRef.DeviceType;
export const ciCjMap = new Map<string, CjData[]>([
[
@ -860,4 +896,6 @@ export const ciCjMap = new Map<string, CjData[]>([
[`${DeviceType.CarWashing}+undefined`, carWashingCjList],
[`${DeviceType.FloodGate}+undefined`, floodGateCjList],
[`${DeviceType.Section}+undefined`, sectionCjList],
[`${DeviceType.Platform}+undefined`, platformCjList],
[`${DeviceType.LS}+undefined`, LSCjList],
]);

32
src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts
View File

@ -427,6 +427,23 @@ const powerScreenCombinations = [
},
];
//LS
const LSCombinations = [
{
code: 'LS',
refDeviceCodesAndModel: [
{
code: 'GDJ',
model: RelayModelType.JWXC_1700,
},
{
code: 'ZFWJ',
model: RelayModelType.JWXC_1700,
},
],
},
];
//车库门
const garageDoorCombinations = [
{
@ -526,6 +543,19 @@ const sectionCombinations = [
},
];
//IBP盘扣车继电器
const platformCombinations = [
{
code: 'IKC',
refDeviceCodesAndModel: [
{
code: 'IKCJ',
model: RelayModelType.JWXC_1700,
},
],
},
];
const DeviceType = graphicData.RelatedRef.DeviceType;
export const combinationsMap = new Map<string, Combinationtype[]>([
[
@ -572,4 +602,6 @@ export const combinationsMap = new Map<string, Combinationtype[]>([
[`${DeviceType.CarWashing}`, carWashingCombinations],
[`${DeviceType.FloodGate}`, floodGateCombinations],
[`${DeviceType.Section}`, sectionCombinations],
[`${DeviceType.Platform}`, platformCombinations],
[`${DeviceType.LS}`, LSCombinations],
]);

58
src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue
View File

@ -205,6 +205,10 @@
v-model="generaterRelayLayout.generateSectionRelay"
label="是否生成区段继电器"
/>
<q-toggle
v-model="generaterRelayLayout.generateIKCJRelay"
label="是否生成IBP盘扣车继电器"
/>
<div class="q-gutter-sm q-pa-md row justify-center">
<q-btn
label="确定"
@ -478,11 +482,13 @@ const generaterRelayLayout = ref<{
centralizedStation: number;
generateCJQD: boolean;
generateSectionRelay: boolean;
generateIKCJRelay: boolean;
}>({
publishId: '',
centralizedStation: 0,
generateCJQD: true,
generateSectionRelay: false,
generateIKCJRelay: false,
});
let publishIdOption = ref<{ label: string; value: number }[]>();
@ -624,6 +630,20 @@ function oneClickGeneraterRelayLayout() {
stationManagePlatformsRefEsb = Array.from(
new Set(stationManagePlatformsRefEsb)
);
//站台--关联的扣车继电器
const deviceCombinationsOfPlatform = combinationsMap.get(
`${DeviceType.Platform}`
);
if (
generaterRelayLayout.value.generateIKCJRelay &&
deviceCombinationsOfPlatform
) {
creatDeviceRelateRelays(
deviceCombinationsOfPlatform,
DeviceType.Platform,
platform.code
);
}
}
});
const stationManageScreenDoor: number[] = [];
@ -632,48 +652,24 @@ function oneClickGeneraterRelayLayout() {
stationManageScreenDoor.push(screenDoor.common.id);
}
});
for (let i = 0; i < storage.esbButtons.length; i++) {
if (
stationManagePlatformsId.includes(storage.esbButtons[i].refStand)
) {
//站台关联的紧急停车继电器的编号
if (stationManagePlatformsRefEsb.length) {
hasEMP_MKX_SPKS.hasEMP = true;
handleEMPCombination();
break;
}
}
for (let i = 0; i < storage.gateBoxs.length; i++) {
if (
stationManageScreenDoor.includes(
storage.gateBoxs[i].refScreenDoor
)
) {
hasEMP_MKX_SPKS.hasMKX = true;
handleDeviceCombinations.push(deviceCombinations[0]);
break;
}
}
for (let i = 0; i < storage.spksSwitchs.length; i++) {
if (
stationManagePlatformsId.includes(storage.spksSwitchs[i].refStand)
) {
hasEMP_MKX_SPKS.hasSPKS = true;
handleDeviceCombinations.push(deviceCombinations[1]);
break;
}
}
//有画pslBox
for (let i = 0; i < storage.pslBoxs.length; i++) {
if (
stationManagePlatformsId.includes(
storage.pslBoxs[i].refPlatformId
)
) {
hasEMP_MKX_SPKS.hasEMP = true;
handleEMPCombination();
hasEMP_MKX_SPKS.hasMKX = true;
handleDeviceCombinations.push(deviceCombinations[0]);
break;
}
}
//有画ibpBox且对应的ibp图中有相关spks按钮
for (let i = 0; i < storage.ibpBoxs.length; i++) {
if (station.common.id == storage.ibpBoxs[i].refStationId) {
hasEMP_MKX_SPKS.hasSPKS = true;
@ -836,7 +832,7 @@ function oneClickGeneraterRelayLayout() {
}
});
}
//信号机故障报警仪-电源屏-断路器
//信号机故障报警仪-电源屏-断路器-LS设备
const aboveCombinations = [
{
combinations: combinationsMap.get(`${DeviceType.SignalFaultAlarm}`),
@ -850,6 +846,10 @@ function oneClickGeneraterRelayLayout() {
combinations: combinationsMap.get(`${DeviceType.PowerScreen}`),
deviceType: DeviceType.PowerScreen,
},
{
combinations: combinationsMap.get(`${DeviceType.LS}`),
deviceType: DeviceType.LS,
},
];
aboveCombinations.forEach((aboveCombination) => {
if (aboveCombination.combinations) {

23
src/protos/relayCabinetLayoutGraphics.ts
View File

@ -368,6 +368,7 @@ export namespace relayCabinetGraphicData {
common?: dependency_1.graphicData.CommonInfo;
code?: string;
newModel?: Relay.ModelType;
showCode?: string;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [], this.#one_of_decls);
@ -381,6 +382,9 @@ export namespace relayCabinetGraphicData {
if ("newModel" in data && data.newModel != undefined) {
this.newModel = data.newModel;
}
if ("showCode" in data && data.showCode != undefined) {
this.showCode = data.showCode;
}
}
}
get common() {
@ -404,10 +408,17 @@ export namespace relayCabinetGraphicData {
set newModel(value: Relay.ModelType) {
pb_1.Message.setField(this, 4, value);
}
get showCode() {
return pb_1.Message.getFieldWithDefault(this, 5, "") as string;
}
set showCode(value: string) {
pb_1.Message.setField(this, 5, value);
}
static fromObject(data: {
common?: ReturnType<typeof dependency_1.graphicData.CommonInfo.prototype.toObject>;
code?: string;
newModel?: Relay.ModelType;
showCode?: string;
}): Relay {
const message = new Relay({});
if (data.common != null) {
@ -419,6 +430,9 @@ export namespace relayCabinetGraphicData {
if (data.newModel != null) {
message.newModel = data.newModel;
}
if (data.showCode != null) {
message.showCode = data.showCode;
}
return message;
}
toObject() {
@ -426,6 +440,7 @@ export namespace relayCabinetGraphicData {
common?: ReturnType<typeof dependency_1.graphicData.CommonInfo.prototype.toObject>;
code?: string;
newModel?: Relay.ModelType;
showCode?: string;
} = {};
if (this.common != null) {
data.common = this.common.toObject();
@ -436,6 +451,9 @@ export namespace relayCabinetGraphicData {
if (this.newModel != null) {
data.newModel = this.newModel;
}
if (this.showCode != null) {
data.showCode = this.showCode;
}
return data;
}
serialize(): Uint8Array;
@ -448,6 +466,8 @@ export namespace relayCabinetGraphicData {
writer.writeString(2, this.code);
if (this.newModel != Relay.ModelType.Unknown)
writer.writeEnum(4, this.newModel);
if (this.showCode.length)
writer.writeString(5, this.showCode);
if (!w)
return writer.getResultBuffer();
}
@ -466,6 +486,9 @@ export namespace relayCabinetGraphicData {
case 4:
message.newModel = reader.readEnum();
break;
case 5:
message.showCode = reader.readString();
break;
default: reader.skipField();
}
}

4
src/protos/stationLayoutGraphics.ts
View File

@ -4709,7 +4709,9 @@ export namespace graphicData {
PowerScreen = 10,
GarageDoor = 11,
CarWashing = 12,
FloodGate = 13
FloodGate = 13,
Platform = 14,
LS = 15
}
export enum DevicePort {
A = 0,