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

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

Browse Source 
commit 54ee649581
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 11:25:09 2024 +0800

    微调

commit 94060bd5e8
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 11:21:30 2024 +0800

    修改继电器布局

commit 8e62b39f34
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Tue Jun 25 09:16:17 2024 +0800

    继电器状态图显示调整+spks生成调整

commit 059a333370
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 21:08:58 2024 +0800

    生成继电器增加展示编号配置

commit ad7a1a8451
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 18:35:14 2024 +0800

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

commit b7a3200560
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Mon Jun 24 08:41:16 2024 +0800

    道岔物理区段也生成GJ继电器

commit 3a372610cf
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Thu Jun 20 17:41:27 2024 +0800

    集中区分割线代码优化（风格线位于边界处一侧未关联区段）

commit d784e2f0e6
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 10:56:19 2024 +0800

    一键关联集中站加道岔物理区段也关联

commit 00d413d494
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Jun 19 09:56:52 2024 +0800

    1.生成计轴时删除区段有问题的计轴（区段延伸处）2.隐藏使用集中区分割线的其他线边界处3.隐藏数据校验

# Conflicts:
#	src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue
This commit is contained in:
joylink_zhaoerwei 2024-06-25 11:28:40 +08:00
parent 4cc5330ec9
commit ec8056e1b7
2 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/layouts/RelayCabinetLayout/GeneraterDevice.ts
View File

@ -159,11 +159,15 @@ export function generateRelayLayout(relays: GenerateRelaysCongig[]) {
relays[i].deviceCode == relays[i - 1].deviceCode &&
relays[i].combinationCode == relays[i - 1].combinationCode &&
relays[i].code != 'GJ' &&
relays[i].combinationCode != 'GJ'
relays[i].combinationCode != 'GJ' &&
relays[i].code != 'IKCJ' &&
relays[i].combinationCode != 'IKC'
) {
relayGroupElement.push(relays[i]);
} else if (relays[i].code == 'GJ' && relays[i].combinationCode == 'GJ') {
relayGroupElement.push(relays[i]);
} else if (relays[i].code == 'IKCJ' && relays[i].combinationCode == 'IKC') {
relayGroupElement.push(relays[i]);
} else {
relayGroup.push(relayGroupElement);
relayGroupElement = [];
@ -175,7 +179,9 @@ export function generateRelayLayout(relays: GenerateRelaysCongig[]) {
(item) =>
item.deviceCode !== undefined &&
item.code !== 'GJ' &&
item.combinationCode !== 'GJ'
item.combinationCode !== 'GJ' &&
item.code !== 'IKCJ' &&
item.combinationCode !== 'IKC'
);
const LSCombination = relayGroupElement.filter(
(item) => item.deviceCode == undefined
@ -183,15 +189,21 @@ export function generateRelayLayout(relays: GenerateRelaysCongig[]) {
const allSectionCombination = relayGroupElement.filter(
(item) => item.code == 'GJ' && item.combinationCode == 'GJ'
);
if (allSectionCombination.length) {
const allPlatfoemCombination = relayGroupElement.filter(
(item) => item.code == 'IKCJ' && item.combinationCode == 'IKC'
);
relayGroup.push(lastCombination);
if (allSectionCombination.length) {
for (let i = 0; i < allSectionCombination.length; i += 11) {
relayGroup.push(allSectionCombination.slice(i, i + 11));
}
relayGroup.push(LSCombination);
} else {
relayGroup.push(lastCombination, LSCombination);
}
if (allPlatfoemCombination.length) {
for (let i = 0; i < allPlatfoemCombination.length; i += 11) {
relayGroup.push(allPlatfoemCombination.slice(i, i + 11));
}
}
relayGroup.push(LSCombination);
const relayCabinet = generateRelayCabinet(relayGroup.length / 10);
for (let i = 0; i < relayCabinet.length; i++) {

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

@ -670,6 +670,7 @@ function oneClickGeneraterRelayLayout() {
hasMKX: false,
hasSPKS: false,
};
const allNeedGenaratePlatform: graphicData.Platform[] = [];
storage.stations.forEach((station) => {
const deviceCombinations = combinationsMap.get(`${DeviceType.station}`);
if (manageStations.includes(station.common.id) && deviceCombinations) {
@ -683,20 +684,7 @@ 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
);
}
allNeedGenaratePlatform.push(platform);
}
});
const stationManageScreenDoor: number[] = [];
@ -864,6 +852,7 @@ function oneClickGeneraterRelayLayout() {
);
}
});
//区段继电器
if (generaterRelayLayout.value.generateSectionRelay) {
storage.section.forEach((section) => {
@ -882,6 +871,21 @@ function oneClickGeneraterRelayLayout() {
}
});
}
//站台--关联的扣车继电器
if (generaterRelayLayout.value.generateIKCJRelay) {
const deviceCombinationsOfPlatform = combinationsMap.get(
`${DeviceType.Platform}`
);
if (deviceCombinationsOfPlatform) {
allNeedGenaratePlatform.forEach((platform) => {
creatDeviceRelateRelays(
deviceCombinationsOfPlatform,
DeviceType.Platform,
platform.code
);
});
}
}
//信号机故障报警仪-电源屏-断路器-LS设备
const aboveCombinations = [
{