Squashed commit of the following:
All checks were successful
CI / Docker-Build (push) Successful in 2m49s
All checks were successful
CI / Docker-Build (push) Successful in 2m49s
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:
parent
77166baf11
commit
4fc4fa6c4f
@ -26,14 +26,6 @@
|
|||||||
@update:model-value="onUpdate"
|
@update:model-value="onUpdate"
|
||||||
label="右边关联的集中站"
|
label="右边关联的集中站"
|
||||||
/>
|
/>
|
||||||
<q-toggle
|
|
||||||
v-model="
|
|
||||||
concentrationDividingLineModel.isOtherLineConcentrationDividingLine
|
|
||||||
"
|
|
||||||
label="是否与其它线的边界处"
|
|
||||||
emit-value
|
|
||||||
@update:model-value="onUpdate"
|
|
||||||
/>
|
|
||||||
<q-list bordered separator class="rounded-borders">
|
<q-list bordered separator class="rounded-borders">
|
||||||
<q-item
|
<q-item
|
||||||
v-for="sectionRelation in sectionRelations"
|
v-for="sectionRelation in sectionRelations"
|
||||||
|
@ -166,16 +166,36 @@ export class AxleCountingDraw extends GraphicDrawAssistant<
|
|||||||
}
|
}
|
||||||
oneGenerates(height: Point) {
|
oneGenerates(height: Point) {
|
||||||
const map = new Map();
|
const map = new Map();
|
||||||
const axleCountings = this.app.queryStore.queryByType<AxleCounting>(
|
const needDelete: AxleCounting[] = [];
|
||||||
AxleCounting.Type
|
const axleCountings = this.app.queryStore
|
||||||
);
|
.queryByType<AxleCounting>(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<Section>(
|
||||||
|
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[] = [];
|
const axleCountingRefs: IRelatedRefData[] = [];
|
||||||
axleCountings.forEach((axleCounting) => {
|
axleCountings.forEach((axleCounting) => {
|
||||||
axleCountingRefs.push(...axleCounting.datas.axleCountingRef);
|
axleCountingRefs.push(...axleCounting.datas.axleCountingRef);
|
||||||
});
|
});
|
||||||
axleCountingRefs.forEach((axleCountingRef) => {
|
axleCountingRefs.forEach((axleCountingRef) => {
|
||||||
map.set(
|
map.set(
|
||||||
`${axleCountingRef.id}-${graphicData.RelatedRef.DevicePort[axleCountingRef.devicePort]
|
`${axleCountingRef.id}-${
|
||||||
|
graphicData.RelatedRef.DevicePort[axleCountingRef.devicePort]
|
||||||
}`,
|
}`,
|
||||||
1
|
1
|
||||||
);
|
);
|
||||||
|
@ -351,7 +351,6 @@ class ControlItem {
|
|||||||
const leftMenuConfig = [
|
const leftMenuConfig = [
|
||||||
{ label: '保存', click: saveAllDrawDatas },
|
{ label: '保存', click: saveAllDrawDatas },
|
||||||
{ label: '另存为', click: () => (saveAsDialog.value = true) },
|
{ label: '另存为', click: () => (saveAsDialog.value = true) },
|
||||||
{ label: '数据校验', click: handleCheckData },
|
|
||||||
{ label: 'UniqueId配置', click: openUniqueIdPrefixDialog },
|
{ label: 'UniqueId配置', click: openUniqueIdPrefixDialog },
|
||||||
{ label: '一键关联', click: buildRelations },
|
{ label: '一键关联', click: buildRelations },
|
||||||
{ label: '一键生成车次窗', click: oneClickGeneration },
|
{ label: '一键生成车次窗', click: oneClickGeneration },
|
||||||
@ -671,7 +670,6 @@ function oneClickRelateCentralizedStation() {
|
|||||||
const drawApp = drawStore.getDrawApp();
|
const drawApp = drawStore.getDrawApp();
|
||||||
const concentrationDividingLines = drawApp.queryStore
|
const concentrationDividingLines = drawApp.queryStore
|
||||||
.queryByType<ConcentrationDividingLine>(ConcentrationDividingLine.Type)
|
.queryByType<ConcentrationDividingLine>(ConcentrationDividingLine.Type)
|
||||||
.filter((g) => !g.datas.isOtherLineConcentrationDividingLine)
|
|
||||||
.sort((a, b) => a.datas.points[0].x - b.datas.points[0].x);
|
.sort((a, b) => a.datas.points[0].x - b.datas.points[0].x);
|
||||||
const hasHandleStation: number[] = [];
|
const hasHandleStation: number[] = [];
|
||||||
for (let i = 0; i < concentrationDividingLines.length - 1; i++) {
|
for (let i = 0; i < concentrationDividingLines.length - 1; i++) {
|
||||||
|
@ -12,9 +12,6 @@
|
|||||||
<q-item clickable v-close-popup @click="saveAsDialog = true">
|
<q-item clickable v-close-popup @click="saveAsDialog = true">
|
||||||
<q-item-section>另存为</q-item-section>
|
<q-item-section>另存为</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item clickable v-close-popup @click="handleCheckData">
|
|
||||||
<q-item-section>数据校验</q-item-section>
|
|
||||||
</q-item>
|
|
||||||
<q-item clickable v-close-popup @click="buildRelations">
|
<q-item clickable v-close-popup @click="buildRelations">
|
||||||
<q-item-section>一键关联</q-item-section>
|
<q-item-section>一键关联</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
|
@ -310,7 +310,6 @@ class ControlItem {
|
|||||||
const leftMenuConfig = [
|
const leftMenuConfig = [
|
||||||
{ label: '保存', click: saveAllDrawDatas },
|
{ label: '保存', click: saveAllDrawDatas },
|
||||||
{ label: '另存为', click: () => (saveAsDialog.value = true) },
|
{ label: '另存为', click: () => (saveAsDialog.value = true) },
|
||||||
{ label: '数据校验', click: handleCheckData },
|
|
||||||
{ label: 'UniqueId配置', click: openUniqueIdPrefixDialog },
|
{ label: 'UniqueId配置', click: openUniqueIdPrefixDialog },
|
||||||
{ label: '批量生成继电器或继电器柜', click: batchBuild },
|
{ label: '批量生成继电器或继电器柜', click: batchBuild },
|
||||||
{
|
{
|
||||||
|
@ -12,9 +12,6 @@
|
|||||||
<q-item clickable v-close-popup @click="saveAsDialog = true">
|
<q-item clickable v-close-popup @click="saveAsDialog = true">
|
||||||
<q-item-section>另存为</q-item-section>
|
<q-item-section>另存为</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item clickable v-close-popup @click="handleCheckData">
|
|
||||||
<q-item-section>数据校验</q-item-section>
|
|
||||||
</q-item>
|
|
||||||
<q-item clickable v-close-popup @click="buildRelations">
|
<q-item clickable v-close-popup @click="buildRelations">
|
||||||
<q-item-section>一键关联</q-item-section>
|
<q-item-section>一键关联</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
|
Loading…
Reference in New Issue
Block a user