From ee2177cd59c0b9597ed4ff0647f58edb0daa426b Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Fri, 14 Jul 2023 15:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A2=E5=BC=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../properties/AxleCountingProperty.vue | 4 +-
.../AxleCountingSectionProperty.vue | 2 +-
.../properties/LogicSectionProperty.vue | 2 +-
.../graphics/AxleCountingInteraction.ts | 8 +-
.../AxleCountingSectionInteraction.ts | 8 +-
.../graphics/LogicSectionInteraction.ts | 8 +-
src/graphics/axleCounting/AxleCounting.ts | 4 +-
.../AxleCountingSection.ts | 4 +-
src/graphics/logicSection/LogicSection.ts | 4 +-
src/protos/stationLayoutGraphics.ts | 84 +++++++++----------
10 files changed, 64 insertions(+), 64 deletions(-)
diff --git a/src/components/draw-app/properties/AxleCountingProperty.vue b/src/components/draw-app/properties/AxleCountingProperty.vue
index 22244b8..b81172b 100644
--- a/src/components/draw-app/properties/AxleCountingProperty.vue
+++ b/src/components/draw-app/properties/AxleCountingProperty.vue
@@ -7,12 +7,12 @@
label="id"
hint=""
/>
-
diff --git a/src/components/draw-app/properties/AxleCountingSectionProperty.vue b/src/components/draw-app/properties/AxleCountingSectionProperty.vue
index f1657c9..7bdb630 100644
--- a/src/components/draw-app/properties/AxleCountingSectionProperty.vue
+++ b/src/components/draw-app/properties/AxleCountingSectionProperty.vue
@@ -12,7 +12,7 @@
label="计轴区段索引编号"
type="textarea"
@blur="onUpdate"
- v-model="axleCountingSectionModel.indexNumber"
+ v-model="axleCountingSectionModel.index"
lazy-rules
autogrow
/>
diff --git a/src/components/draw-app/properties/LogicSectionProperty.vue b/src/components/draw-app/properties/LogicSectionProperty.vue
index bdbc260..d40539c 100644
--- a/src/components/draw-app/properties/LogicSectionProperty.vue
+++ b/src/components/draw-app/properties/LogicSectionProperty.vue
@@ -12,7 +12,7 @@
label="索引编号"
type="textarea"
@blur="onUpdate"
- v-model="logicSectionModel.indexNumber"
+ v-model="logicSectionModel.index"
lazy-rules
autogrow
/>
diff --git a/src/drawApp/graphics/AxleCountingInteraction.ts b/src/drawApp/graphics/AxleCountingInteraction.ts
index 64adf28..42b4c3f 100644
--- a/src/drawApp/graphics/AxleCountingInteraction.ts
+++ b/src/drawApp/graphics/AxleCountingInteraction.ts
@@ -44,11 +44,11 @@ export class AxleCountingData
set axleCountingRef(points: graphicData.RelatedRef[]) {
this.data.axleCountingRef = points;
}
- get indexNumber(): number {
- return this.data.indexNumber;
+ get index(): number {
+ return this.data.index;
}
- set indexNumber(v: number) {
- this.data.indexNumber = v;
+ set index(v: number) {
+ this.data.index = v;
}
clone(): AxleCountingData {
return new AxleCountingData(this.data.cloneMessage());
diff --git a/src/drawApp/graphics/AxleCountingSectionInteraction.ts b/src/drawApp/graphics/AxleCountingSectionInteraction.ts
index 053c76d..17cdf26 100644
--- a/src/drawApp/graphics/AxleCountingSectionInteraction.ts
+++ b/src/drawApp/graphics/AxleCountingSectionInteraction.ts
@@ -58,11 +58,11 @@ export class AxleCountingSectionData
set turnoutPosRef(points: ITurnoutPosRefData[]) {
this.data.turnoutPos = points.map((p) => new graphicData.TurnoutPosRef(p));
}
- get indexNumber(): number {
- return this.data.indexNumber;
+ get index(): number {
+ return this.data.index;
}
- set indexNumber(v: number) {
- this.data.indexNumber = v;
+ set index(v: number) {
+ this.data.index = v;
}
clone(): AxleCountingSectionData {
return new AxleCountingSectionData(this.data.cloneMessage());
diff --git a/src/drawApp/graphics/LogicSectionInteraction.ts b/src/drawApp/graphics/LogicSectionInteraction.ts
index e1f72f1..19539ce 100644
--- a/src/drawApp/graphics/LogicSectionInteraction.ts
+++ b/src/drawApp/graphics/LogicSectionInteraction.ts
@@ -45,11 +45,11 @@ export class LogicSectionData
set axleSectionId(v: string) {
this.data.axleSectionId = v;
}
- get indexNumber(): number {
- return this.data.indexNumber;
+ get index(): number {
+ return this.data.index;
}
- set indexNumber(v: number) {
- this.data.indexNumber = v;
+ set index(v: number) {
+ this.data.index = v;
}
get turnoutId(): string {
return this.data.turnoutId;
diff --git a/src/graphics/axleCounting/AxleCounting.ts b/src/graphics/axleCounting/AxleCounting.ts
index 1334812..0c5550e 100644
--- a/src/graphics/axleCounting/AxleCounting.ts
+++ b/src/graphics/axleCounting/AxleCounting.ts
@@ -16,8 +16,8 @@ export interface IAxleCountingData extends GraphicData {
set kilometerSystem(v: KilometerSystem);
get axleCountingRef(): IRelatedRefData[]; //关联的设备
set axleCountingRef(ref: IRelatedRefData[]);
- get indexNumber(): number; // 索引编号
- set indexNumber(v: number);
+ get index(): number; // 索引编号
+ set index(v: number);
clone(): IAxleCountingData;
copyFrom(data: IAxleCountingData): void;
eq(other: IAxleCountingData): boolean;
diff --git a/src/graphics/axleCountingSection/AxleCountingSection.ts b/src/graphics/axleCountingSection/AxleCountingSection.ts
index e5ec5bb..bbebf01 100644
--- a/src/graphics/axleCountingSection/AxleCountingSection.ts
+++ b/src/graphics/axleCountingSection/AxleCountingSection.ts
@@ -28,8 +28,8 @@ export interface IAxleCountingSectionData extends GraphicData {
set pbRef(ref: IRelatedRefData | undefined);
get turnoutPosRef(): ITurnoutPosRefData[]; //关联道岔的定反位--0是定位，1是反位
set turnoutPosRef(ref: ITurnoutPosRefData[]);
- get indexNumber(): number; // 索引编号
- set indexNumber(v: number);
+ get index(): number; // 索引编号
+ set index(v: number);
clone(): IAxleCountingSectionData;
copyFrom(data: IAxleCountingSectionData): void;
eq(other: IAxleCountingSectionData): boolean;
diff --git a/src/graphics/logicSection/LogicSection.ts b/src/graphics/logicSection/LogicSection.ts
index 9162402..6c4f4a8 100644
--- a/src/graphics/logicSection/LogicSection.ts
+++ b/src/graphics/logicSection/LogicSection.ts
@@ -17,8 +17,8 @@ export interface ILogicSectionData extends GraphicData {
set points(points: IPointData[]);
get axleSectionId(): string; // 计轴区段ID
set axleSectionId(v: string);
- get indexNumber(): number; // 索引编号
- set indexNumber(v: number);
+ get index(): number; // 索引编号
+ set index(v: number);
get turnoutId(): string; // 关联岔芯的道岔id
set turnoutId(v: string);
clone(): ILogicSectionData;
diff --git a/src/protos/stationLayoutGraphics.ts b/src/protos/stationLayoutGraphics.ts
index f24f9c1..ee0c719 100644
--- a/src/protos/stationLayoutGraphics.ts
+++ b/src/protos/stationLayoutGraphics.ts
@@ -1361,7 +1361,7 @@ export namespace graphicData {
code?: string;
kilometerSystem?: KilometerSystem;
axleCountingRef?: RelatedRef[];
- indexNumber?: number;
+ index?: number;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [4], this.#one_of_decls);
@@ -1378,8 +1378,8 @@ export namespace graphicData {
if ("axleCountingRef" in data && data.axleCountingRef != undefined) {
this.axleCountingRef = data.axleCountingRef;
}
- if ("indexNumber" in data && data.indexNumber != undefined) {
- this.indexNumber = data.indexNumber;
+ if ("index" in data && data.index != undefined) {
+ this.index = data.index;
}
}
}
@@ -1413,10 +1413,10 @@ export namespace graphicData {
set axleCountingRef(value: RelatedRef[]) {
pb_1.Message.setRepeatedWrapperField(this, 4, value);
}
- get indexNumber() {
+ get index() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
- set indexNumber(value: number) {
+ set index(value: number) {
pb_1.Message.setField(this, 5, value);
}
static fromObject(data: {
@@ -1424,7 +1424,7 @@ export namespace graphicData {
code?: string;
kilometerSystem?: ReturnType;
axleCountingRef?: ReturnType[];
- indexNumber?: number;
+ index?: number;
}): AxleCounting {
const message = new AxleCounting({});
if (data.common != null) {
@@ -1439,8 +1439,8 @@ export namespace graphicData {
if (data.axleCountingRef != null) {
message.axleCountingRef = data.axleCountingRef.map(item => RelatedRef.fromObject(item));
}
- if (data.indexNumber != null) {
- message.indexNumber = data.indexNumber;
+ if (data.index != null) {
+ message.index = data.index;
}
return message;
}
@@ -1450,7 +1450,7 @@ export namespace graphicData {
code?: string;
kilometerSystem?: ReturnType;
axleCountingRef?: ReturnType[];
- indexNumber?: number;
+ index?: number;
} = {};
if (this.common != null) {
data.common = this.common.toObject();
@@ -1464,8 +1464,8 @@ export namespace graphicData {
if (this.axleCountingRef != null) {
data.axleCountingRef = this.axleCountingRef.map((item: RelatedRef) => item.toObject());
}
- if (this.indexNumber != null) {
- data.indexNumber = this.indexNumber;
+ if (this.index != null) {
+ data.index = this.index;
}
return data;
}
@@ -1481,8 +1481,8 @@ export namespace graphicData {
writer.writeMessage(3, this.kilometerSystem, () => this.kilometerSystem.serialize(writer));
if (this.axleCountingRef.length)
writer.writeRepeatedMessage(4, this.axleCountingRef, (item: RelatedRef) => item.serialize(writer));
- if (this.indexNumber != 0)
- writer.writeInt32(5, this.indexNumber);
+ if (this.index != 0)
+ writer.writeInt32(5, this.index);
if (!w)
return writer.getResultBuffer();
}
@@ -1505,7 +1505,7 @@ export namespace graphicData {
reader.readMessage(message.axleCountingRef, () => pb_1.Message.addToRepeatedWrapperField(message, 4, RelatedRef.deserialize(reader), RelatedRef));
break;
case 5:
- message.indexNumber = reader.readInt32();
+ message.index = reader.readInt32();
break;
default: reader.skipField();
}
@@ -3077,7 +3077,7 @@ export namespace graphicData {
paRef?: RelatedRef;
pbRef?: RelatedRef;
turnoutPos?: TurnoutPosRef[];
- indexNumber?: number;
+ index?: number;
}) {
super();
pb_1.Message.initialize(this, Array.isArray(data) ? data : [], 0, -1, [3, 6], this.#one_of_decls);
@@ -3100,8 +3100,8 @@ export namespace graphicData {
if ("turnoutPos" in data && data.turnoutPos != undefined) {
this.turnoutPos = data.turnoutPos;
}
- if ("indexNumber" in data && data.indexNumber != undefined) {
- this.indexNumber = data.indexNumber;
+ if ("index" in data && data.index != undefined) {
+ this.index = data.index;
}
}
}
@@ -3150,10 +3150,10 @@ export namespace graphicData {
set turnoutPos(value: TurnoutPosRef[]) {
pb_1.Message.setRepeatedWrapperField(this, 6, value);
}
- get indexNumber() {
+ get index() {
return pb_1.Message.getFieldWithDefault(this, 7, 0) as number;
}
- set indexNumber(value: number) {
+ set index(value: number) {
pb_1.Message.setField(this, 7, value);
}
static fromObject(data: {
@@ -3163,7 +3163,7 @@ export namespace graphicData {
paRef?: ReturnType;
pbRef?: ReturnType;
turnoutPos?: ReturnType[];
- indexNumber?: number;
+ index?: number;
}): AxleCountingSection {
const message = new AxleCountingSection({});
if (data.common != null) {
@@ -3184,8 +3184,8 @@ export namespace graphicData {
if (data.turnoutPos != null) {
message.turnoutPos = data.turnoutPos.map(item => TurnoutPosRef.fromObject(item));
}
- if (data.indexNumber != null) {
- message.indexNumber = data.indexNumber;
+ if (data.index != null) {
+ message.index = data.index;
}
return message;
}
@@ -3197,7 +3197,7 @@ export namespace graphicData {
paRef?: ReturnType;
pbRef?: ReturnType;
turnoutPos?: ReturnType[];
- indexNumber?: number;
+ index?: number;
} = {};
if (this.common != null) {
data.common = this.common.toObject();
@@ -3217,8 +3217,8 @@ export namespace graphicData {
if (this.turnoutPos != null) {
data.turnoutPos = this.turnoutPos.map((item: TurnoutPosRef) => item.toObject());
}
- if (this.indexNumber != null) {
- data.indexNumber = this.indexNumber;
+ if (this.index != null) {
+ data.index = this.index;
}
return data;
}
@@ -3238,8 +3238,8 @@ export namespace graphicData {
writer.writeMessage(5, this.pbRef, () => this.pbRef.serialize(writer));
if (this.turnoutPos.length)
writer.writeRepeatedMessage(6, this.turnoutPos, (item: TurnoutPosRef) => item.serialize(writer));
- if (this.indexNumber != 0)
- writer.writeInt32(7, this.indexNumber);
+ if (this.index != 0)
+ writer.writeInt32(7, this.index);
if (!w)
return writer.getResultBuffer();
}
@@ -3268,7 +3268,7 @@ export namespace graphicData {
reader.readMessage(message.turnoutPos, () => pb_1.Message.addToRepeatedWrapperField(message, 6, TurnoutPosRef.deserialize(reader), TurnoutPosRef));
break;
case 7:
- message.indexNumber = reader.readInt32();
+ message.index = reader.readInt32();
break;
default: reader.skipField();
}
@@ -3289,7 +3289,7 @@ export namespace graphicData {
code?: string;
points?: Point[];
axleSectionId?: string;
- indexNumber?: number;
+ index?: number;
turnoutId?: string;
}) {
super();
@@ -3307,8 +3307,8 @@ export namespace graphicData {
if ("axleSectionId" in data && data.axleSectionId != undefined) {
this.axleSectionId = data.axleSectionId;
}
- if ("indexNumber" in data && data.indexNumber != undefined) {
- this.indexNumber = data.indexNumber;
+ if ("index" in data && data.index != undefined) {
+ this.index = data.index;
}
if ("turnoutId" in data && data.turnoutId != undefined) {
this.turnoutId = data.turnoutId;
@@ -3342,10 +3342,10 @@ export namespace graphicData {
set axleSectionId(value: string) {
pb_1.Message.setField(this, 4, value);
}
- get indexNumber() {
+ get index() {
return pb_1.Message.getFieldWithDefault(this, 5, 0) as number;
}
- set indexNumber(value: number) {
+ set index(value: number) {
pb_1.Message.setField(this, 5, value);
}
get turnoutId() {
@@ -3359,7 +3359,7 @@ export namespace graphicData {
code?: string;
points?: ReturnType[];
axleSectionId?: string;
- indexNumber?: number;
+ index?: number;
turnoutId?: string;
}): LogicSection {
const message = new LogicSection({});
@@ -3375,8 +3375,8 @@ export namespace graphicData {
if (data.axleSectionId != null) {
message.axleSectionId = data.axleSectionId;
}
- if (data.indexNumber != null) {
- message.indexNumber = data.indexNumber;
+ if (data.index != null) {
+ message.index = data.index;
}
if (data.turnoutId != null) {
message.turnoutId = data.turnoutId;
@@ -3389,7 +3389,7 @@ export namespace graphicData {
code?: string;
points?: ReturnType[];
axleSectionId?: string;
- indexNumber?: number;
+ index?: number;
turnoutId?: string;
} = {};
if (this.common != null) {
@@ -3404,8 +3404,8 @@ export namespace graphicData {
if (this.axleSectionId != null) {
data.axleSectionId = this.axleSectionId;
}
- if (this.indexNumber != null) {
- data.indexNumber = this.indexNumber;
+ if (this.index != null) {
+ data.index = this.index;
}
if (this.turnoutId != null) {
data.turnoutId = this.turnoutId;
@@ -3424,8 +3424,8 @@ export namespace graphicData {
writer.writeRepeatedMessage(3, this.points, (item: Point) => item.serialize(writer));
if (this.axleSectionId.length)
writer.writeString(4, this.axleSectionId);
- if (this.indexNumber != 0)
- writer.writeInt32(5, this.indexNumber);
+ if (this.index != 0)
+ writer.writeInt32(5, this.index);
if (this.turnoutId.length)
writer.writeString(6, this.turnoutId);
if (!w)
@@ -3450,7 +3450,7 @@ export namespace graphicData {
message.axleSectionId = reader.readString();
break;
case 5:
- message.indexNumber = reader.readInt32();
+ message.index = reader.readInt32();
break;
case 6:
message.turnoutId = reader.readString();