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

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.隐藏数据校验
This commit is contained in:
joylink_zhaoerwei 2024-06-20 17:42:21 +08:00
parent 371755d2b5
commit 23ff38bbc7

View File

@ -686,7 +686,7 @@ function oneClickRelateCentralizedStation() {
port: graphicData.RelatedRef.DevicePort;
}[] = [];
rightDatas.nodeConWithSecs.forEach((node) => {
if (node.rightSection.id) {
if (node.rightSection && node.rightSection.id) {
rightSections.push({
section: drawApp.queryStore.queryById(node.rightSection.id),
port: node.rightSection.devicePort,
@ -699,7 +699,7 @@ function oneClickRelateCentralizedStation() {
const LeftDatas = concentrationDividingLines[j].datas;
if (LeftDatas.refLeftStationId == rightDatas.refRightStationId) {
LeftDatas.nodeConWithSecs.forEach((node) => {
if (node.leftSection.id) {
if (node.leftSection && node.leftSection.id) {
leftSections.push(node.leftSection.id);
}
});
@ -767,18 +767,20 @@ function oneClickRelateCentralizedStation() {
concentrationDividingLines.forEach((concentrationDividingLine) => {
concentrationDividingLine.datas.nodeConWithSecs.forEach(
(nodeConWithSec) => {
const ids = [
nodeConWithSec.leftSection.id,
nodeConWithSec.rightSection.id,
];
if (ids[0] && ids[1]) {
if (
nodeConWithSec.leftSection.deviceType ==
graphicData.RelatedRef.DeviceType.Section
) {
handleNodeConWithSec(nodeConWithSec.leftSection, ids);
} else {
handleNodeConWithSec(nodeConWithSec.rightSection, ids);
if (nodeConWithSec.leftSection && nodeConWithSec.rightSection) {
const ids = [
nodeConWithSec.leftSection.id,
nodeConWithSec.rightSection.id,
];
if (ids[0] && ids[1]) {
if (
nodeConWithSec.leftSection.deviceType ==
graphicData.RelatedRef.DeviceType.Section
) {
handleNodeConWithSec(nodeConWithSec.leftSection, ids);
} else {
handleNodeConWithSec(nodeConWithSec.rightSection, ids);
}
}
}
}
@ -892,7 +894,7 @@ function oneClickRelateCentralizedStation() {
port: graphicData.RelatedRef.DevicePort;
}[] = [];
leftBoundary.datas.nodeConWithSecs.forEach((node) => {
if (node.leftSection.id) {
if (node.leftSection && node.leftSection.id) {
leftSections.push({
section: drawApp.queryStore.queryById(node.leftSection.id),
port: node.leftSection.devicePort,
@ -924,7 +926,7 @@ function oneClickRelateCentralizedStation() {
port: graphicData.RelatedRef.DevicePort;
}[] = [];
rightBoundary.datas.nodeConWithSecs.forEach((node) => {
if (node.rightSection.id) {
if (node.rightSection && node.rightSection.id) {
rightSections.push({
section: drawApp.queryStore.queryById(node.rightSection.id),
port: node.rightSection.devicePort,