From 4ac1338b851d2da9da0d9fd6c8a4b580a158edc4 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Thu, 21 Dec 2023 16:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E9=87=8C=E6=A0=87=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draw-app/dialogs/SetGaryLineDialog.vue    |  1 -
 .../properties/AxleCountingProperty.vue       | 49 +++++++------
 .../draw-app/properties/SignalProperty.vue    | 38 +++++-----
 .../draw-app/properties/StationProperty.vue   | 41 ++++++-----
 .../draw-app/properties/TurnoutProperty.vue   | 72 ++++++++++---------
 src/graphics/train/Train.ts                   |  3 -
 6 files changed, 108 insertions(+), 96 deletions(-)

diff --git a/src/components/draw-app/dialogs/SetGaryLineDialog.vue b/src/components/draw-app/dialogs/SetGaryLineDialog.vue
index cbb5005..e7436ea 100644
--- a/src/components/draw-app/dialogs/SetGaryLineDialog.vue
+++ b/src/components/draw-app/dialogs/SetGaryLineDialog.vue
@@ -50,7 +50,6 @@ const model = ref({
 });
 
 onMounted(() => {
-  console.log(props.garyPointIndexs, '===');
   if (props.garyPointIndexs.length) {
     model.value = {
       min: props.garyPointIndexs[0],
diff --git a/src/components/draw-app/properties/AxleCountingProperty.vue b/src/components/draw-app/properties/AxleCountingProperty.vue
index af227f5..6fb494d 100644
--- a/src/components/draw-app/properties/AxleCountingProperty.vue
+++ b/src/components/draw-app/properties/AxleCountingProperty.vue
@@ -1,12 +1,6 @@
 <template>
   <q-form class="q-gutter-sm">
-    <q-input
-      outlined
-      readonly
-      v-model="axleCountingModel.id"
-      label="id"
-      hint=""
-    />
+    <q-input outlined readonly v-model="axleCountingModel.id" label="id" />
     <q-input
       outlined
       label="计轴名称"
@@ -16,24 +10,29 @@
       lazy-rules
       autogrow
     />
-    <q-select
-      outlined
-      style="margin-top: 10px"
-      v-model="axleCountingModel.kilometerSystem.coordinateSystem"
-      :options="CoordinateSystemOptions"
-      :map-options="true"
-      :emit-value="true"
-      @update:model-value="onUpdate"
-      label="坐标系"
-    ></q-select>
-    <q-input
-      outlined
-      style="margin-top: 10px"
-      v-model.number="axleCountingModel.kilometerSystem.kilometer"
-      type="number"
-      @blur="onUpdate"
-      label="公里标(mm):"
-    />
+    <q-list bordered separator class="rounded-borders">
+      <q-item no-wrap class="q-gutter-y-sm column">
+        <div>公里标配置</div>
+        <q-select
+          outlined
+          style="margin-top: 10px"
+          v-model="axleCountingModel.kilometerSystem.coordinateSystem"
+          :options="CoordinateSystemOptions"
+          :map-options="true"
+          :emit-value="true"
+          @update:model-value="onUpdate"
+          label="坐标系"
+        ></q-select>
+        <q-input
+          outlined
+          style="margin-top: 10px"
+          v-model.number="axleCountingModel.kilometerSystem.kilometer"
+          type="number"
+          @blur="onUpdate"
+          label="公里标(mm):"
+        />
+      </q-item>
+    </q-list>
     <q-list bordered separator class="rounded-borders">
       <q-item>
         <q-item-section no-wrap class="q-gutter-y-sm column">
diff --git a/src/components/draw-app/properties/SignalProperty.vue b/src/components/draw-app/properties/SignalProperty.vue
index f297a31..c1da632 100644
--- a/src/components/draw-app/properties/SignalProperty.vue
+++ b/src/components/draw-app/properties/SignalProperty.vue
@@ -33,22 +33,27 @@
       @update:model-value="onUpdate"
       label="关联设备端口:"
     ></q-select>
-    <q-select
-      outlined
-      v-model="signalModel.kilometerSystem.coordinateSystem"
-      :options="CoordinateSystemOptions"
-      :map-options="true"
-      :emit-value="true"
-      @update:model-value="onUpdate"
-      label="坐标系"
-    ></q-select>
-    <q-input
-      outlined
-      v-model.number="signalModel.kilometerSystem.kilometer"
-      type="number"
-      @blur="onUpdate"
-      label="公里标(mm):"
-    />
+    <q-list bordered separator class="rounded-borders">
+      <q-item no-wrap class="q-gutter-y-sm column">
+        <div>公里标配置</div>
+        <q-select
+          outlined
+          v-model="signalModel.kilometerSystem.coordinateSystem"
+          :options="CoordinateSystemOptions"
+          :map-options="true"
+          :emit-value="true"
+          @update:model-value="onUpdate"
+          label="坐标系"
+        ></q-select>
+        <q-input
+          outlined
+          v-model.number="signalModel.kilometerSystem.kilometer"
+          type="number"
+          @blur="onUpdate"
+          label="公里标(mm):"
+        />
+      </q-item>
+    </q-list>
     <q-select
       outlined
       v-model="signalModel.centralizedStation"
@@ -78,7 +83,6 @@ const { data: signalModel, onUpdate } = useFormData(
 );
 
 const refDevData = computed(() => {
-  console.log(signalModel, '====');
   return signalModel.refDevice
     ? {
         ...signalModel.refDevice.toObject(),
diff --git a/src/components/draw-app/properties/StationProperty.vue b/src/components/draw-app/properties/StationProperty.vue
index 0ba7b2a..fea0c31 100644
--- a/src/components/draw-app/properties/StationProperty.vue
+++ b/src/components/draw-app/properties/StationProperty.vue
@@ -19,24 +19,29 @@
       lazy-rules
       autogrow
     />
-    <q-select
-      outlined
-      style="margin-top: 10px"
-      v-model="stationModel.kilometerSystem.coordinateSystem"
-      :options="CoordinateSystemOptions"
-      :map-options="true"
-      :emit-value="true"
-      @update:model-value="onUpdate"
-      label="坐标系"
-    ></q-select>
-    <q-input
-      outlined
-      style="margin-top: 10px"
-      v-model.number="stationModel.kilometerSystem.kilometer"
-      type="number"
-      @blur="onUpdate"
-      label="公里标(mm):"
-    />
+    <q-list bordered separator class="rounded-borders">
+      <q-item no-wrap class="q-gutter-y-sm column">
+        <div>公里标配置</div>
+        <q-select
+          outlined
+          style="margin-top: 10px"
+          v-model="stationModel.kilometerSystem.coordinateSystem"
+          :options="CoordinateSystemOptions"
+          :map-options="true"
+          :emit-value="true"
+          @update:model-value="onUpdate"
+          label="坐标系"
+        ></q-select>
+        <q-input
+          outlined
+          style="margin-top: 10px"
+          v-model.number="stationModel.kilometerSystem.kilometer"
+          type="number"
+          @blur="onUpdate"
+          label="公里标(mm):"
+        />
+      </q-item>
+    </q-list>
     <q-select
       v-if="stationModel.concentrationStations"
       outlined
diff --git a/src/components/draw-app/properties/TurnoutProperty.vue b/src/components/draw-app/properties/TurnoutProperty.vue
index a41d3f8..5a34933 100644
--- a/src/components/draw-app/properties/TurnoutProperty.vue
+++ b/src/components/draw-app/properties/TurnoutProperty.vue
@@ -7,38 +7,46 @@
       @blur="onUpdate"
       label="编号"
     />
-    <q-select
-      outlined
-      v-model="turnoutModel.kilometerSystem[0].coordinateSystem"
-      :options="CoordinateSystemOptions"
-      :map-options="true"
-      :emit-value="true"
-      @update:model-value="onUpdate"
-      label="坐标系"
-    ></q-select>
-    <q-input
-      outlined
-      v-model.number="turnoutModel.kilometerSystem[0].kilometer"
-      type="number"
-      @blur="onUpdate"
-      label="公里标(mm):"
-    />
-    <q-select
-      outlined
-      v-model="turnoutModel.kilometerSystem[1].coordinateSystem"
-      :options="CoordinateSystemOptions"
-      :map-options="true"
-      :emit-value="true"
-      @update:model-value="onUpdate"
-      label="坐标系2"
-    ></q-select>
-    <q-input
-      outlined
-      v-model.number="turnoutModel.kilometerSystem[1].kilometer"
-      type="number"
-      @blur="onUpdate"
-      label="公里标(mm):"
-    />
+    <q-list bordered separator class="rounded-borders">
+      <q-item no-wrap class="q-gutter-y-sm column">
+        <div>公里标配置</div>
+        <q-select
+          outlined
+          v-model="turnoutModel.kilometerSystem[0].coordinateSystem"
+          :options="CoordinateSystemOptions"
+          :map-options="true"
+          :emit-value="true"
+          @update:model-value="onUpdate"
+          label="坐标系"
+        ></q-select>
+        <q-input
+          outlined
+          v-model.number="turnoutModel.kilometerSystem[0].kilometer"
+          type="number"
+          @blur="onUpdate"
+          label="公里标(mm):"
+        />
+      </q-item>
+      <q-item no-wrap class="q-gutter-y-sm column">
+        <div>公里标配置</div>
+        <q-select
+          outlined
+          v-model="turnoutModel.kilometerSystem[1].coordinateSystem"
+          :options="CoordinateSystemOptions"
+          :map-options="true"
+          :emit-value="true"
+          @update:model-value="onUpdate"
+          label="坐标系2"
+        ></q-select>
+        <q-input
+          outlined
+          v-model.number="turnoutModel.kilometerSystem[1].kilometer"
+          type="number"
+          @blur="onUpdate"
+          label="公里标(mm):"
+        />
+      </q-item>
+    </q-list>
     <q-field class="q-mt-lg" outlined label="关联区段" readonly stack-label>
       <template #control>
         <q-chip
diff --git a/src/graphics/train/Train.ts b/src/graphics/train/Train.ts
index 85f4797..31f92dc 100644
--- a/src/graphics/train/Train.ts
+++ b/src/graphics/train/Train.ts
@@ -110,9 +110,6 @@ enum statusTextColor {
   A = '0xFF0000', // A报警
 }
 
-console.log(LogicSection);
-console.trace(1);
-
 const deviceTypeString = new Map();
 deviceTypeString.set(state.DeviceType.TRACK, LogicSection.Type);
 deviceTypeString.set(state.DeviceType.SWITCH_TRACK, Section.Type);