Merge branch 'master' of https://git.code.tencent.com/beijing-rtss-test/bj-rtss-client

src/components/draw-app/properties/AxleCountingProperty.vue

@@ -12,7 +12,7 @@
       label="计轴索引编号"
       type="textarea"
       @blur="onUpdate"
-      v-model="axleCountingModel.indexNumber"
+      v-model="axleCountingModel.index"
       lazy-rules
       autogrow
     />

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
     />

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
     />

src/drawApp/graphics/AxleCountingInteraction.ts

@@ -44,11 +44,11 @@ export class AxleCountingData
   set axleCountingRef(points: graphicData.RelatedRef[]) {
     this.data.axleCountingRef = points;
   }
-  get indexNumber(): number {
+  get index(): number {
-    return this.data.indexNumber;
+    return this.data.index;
   }
-  set indexNumber(v: number) {
+  set index(v: number) {
-    this.data.indexNumber = v;
+    this.data.index = v;
   }
   clone(): AxleCountingData {
     return new AxleCountingData(this.data.cloneMessage());

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 {
+  get index(): number {
-    return this.data.indexNumber;
+    return this.data.index;
   }
-  set indexNumber(v: number) {
+  set index(v: number) {
-    this.data.indexNumber = v;
+    this.data.index = v;
   }
   clone(): AxleCountingSectionData {
     return new AxleCountingSectionData(this.data.cloneMessage());

src/drawApp/graphics/LogicSectionInteraction.ts

@@ -45,11 +45,11 @@ export class LogicSectionData
   set axleSectionId(v: string) {
     this.data.axleSectionId = v;
   }
-  get indexNumber(): number {
+  get index(): number {
-    return this.data.indexNumber;
+    return this.data.index;
   }
-  set indexNumber(v: number) {
+  set index(v: number) {
-    this.data.indexNumber = v;
+    this.data.index = v;
   }
   get turnoutId(): string {
     return this.data.turnoutId;

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; // 索引编号
+  get index(): number; // 索引编号
-  set indexNumber(v: number);
+  set index(v: number);
   clone(): IAxleCountingData;
   copyFrom(data: IAxleCountingData): void;
   eq(other: IAxleCountingData): boolean;

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; // 索引编号
+  get index(): number; // 索引编号
-  set indexNumber(v: number);
+  set index(v: number);
   clone(): IAxleCountingSectionData;
   copyFrom(data: IAxleCountingSectionData): void;
   eq(other: IAxleCountingSectionData): boolean;

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; // 索引编号
+  get index(): number; // 索引编号
-  set indexNumber(v: number);
+  set index(v: number);
   get turnoutId(): string; // 关联岔芯的道岔id
   set turnoutId(v: string);
   clone(): ILogicSectionData;