diff --git a/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue b/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue index a2d67b6..53496c3 100644 --- a/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue +++ b/src/components/draw-app/properties/ConcentrationDividingLineProperty.vue @@ -26,14 +26,6 @@ @update:model-value="onUpdate" label="右边关联的集中站" /> - ( - AxleCounting.Type - ); + const needDelete: AxleCounting[] = []; + const axleCountings = this.app.queryStore + .queryByType(AxleCounting.Type) + .filter((axleCounting) => { + if (axleCounting.datas.axleCountingRef.length == 1) { + const refInfo = axleCounting.datas.axleCountingRef[0]; + if (refInfo.deviceType == graphicData.RelatedRef.DeviceType.Section) { + const refSection = this.app.queryStore.queryById
( + refInfo.id + ); + if ( + refSection.datas.paRef != undefined && + refSection.datas.pbRef != undefined + ) { + needDelete.push(axleCounting); + return false; + } + } + } + return true; + }); + this.app.deleteGraphics(...needDelete); const axleCountingRefs: IRelatedRefData[] = []; axleCountings.forEach((axleCounting) => { axleCountingRefs.push(...axleCounting.datas.axleCountingRef); }); axleCountingRefs.forEach((axleCountingRef) => { map.set( - `${axleCountingRef.id}-${graphicData.RelatedRef.DevicePort[axleCountingRef.devicePort] + `${axleCountingRef.id}-${ + graphicData.RelatedRef.DevicePort[axleCountingRef.devicePort] }`, 1 ); diff --git a/src/layouts/DrawLayout.vue b/src/layouts/DrawLayout.vue index 752c2a9..7d0a0ee 100644 --- a/src/layouts/DrawLayout.vue +++ b/src/layouts/DrawLayout.vue @@ -351,7 +351,6 @@ class ControlItem { const leftMenuConfig = [ { label: '保存', click: saveAllDrawDatas }, { label: '另存为', click: () => (saveAsDialog.value = true) }, - { label: '数据校验', click: handleCheckData }, { label: 'UniqueId配置', click: openUniqueIdPrefixDialog }, { label: '一键关联', click: buildRelations }, { label: '一键生成车次窗', click: oneClickGeneration }, @@ -671,7 +670,6 @@ function oneClickRelateCentralizedStation() { const drawApp = drawStore.getDrawApp(); const concentrationDividingLines = drawApp.queryStore .queryByType(ConcentrationDividingLine.Type) - .filter((g) => !g.datas.isOtherLineConcentrationDividingLine) .sort((a, b) => a.datas.points[0].x - b.datas.points[0].x); const hasHandleStation: number[] = []; for (let i = 0; i < concentrationDividingLines.length - 1; i++) { diff --git a/src/layouts/PslDrawLayout.vue b/src/layouts/PslDrawLayout.vue index d53dd22..93c6705 100644 --- a/src/layouts/PslDrawLayout.vue +++ b/src/layouts/PslDrawLayout.vue @@ -12,9 +12,6 @@ 另存为 - - 数据校验 - 一键关联 diff --git a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue index 2511a03..9baff82 100644 --- a/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue +++ b/src/layouts/RelayCabinetLayout/RelayCabinetLayout.vue @@ -310,7 +310,6 @@ class ControlItem { const leftMenuConfig = [ { label: '保存', click: saveAllDrawDatas }, { label: '另存为', click: () => (saveAsDialog.value = true) }, - { label: '数据校验', click: handleCheckData }, { label: 'UniqueId配置', click: openUniqueIdPrefixDialog }, { label: '批量生成继电器或继电器柜', click: batchBuild }, { diff --git a/src/layouts/TrainControlCabDrawLayout.vue b/src/layouts/TrainControlCabDrawLayout.vue index 95e7225..b77dfc9 100644 --- a/src/layouts/TrainControlCabDrawLayout.vue +++ b/src/layouts/TrainControlCabDrawLayout.vue @@ -12,9 +12,6 @@ 另存为 - - 数据校验 - 一键关联