From 1dad042c621eaa98a0f6fb7c9a608507e7d2aecc Mon Sep 17 00:00:00 2001
From: fan <fanyuhong@joylink.club>
Date: Thu, 19 Oct 2023 10:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E9=87=8C=E6=A0=87=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=94=BE=E5=BC=80=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../draw-app/dialogs/KilometerConvertList.vue | 11 +--------
 .../properties/AxleCountingProperty.vue       | 15 +++---------
 .../CurvatureKiloMarkerProperty.vue           | 24 +++++--------------
 .../properties/KilometerConvertConfig.vue     | 15 ++++--------
 .../draw-app/properties/SignalProperty.vue    | 15 +++---------
 .../properties/SlopeKiloMarkerProperty.vue    | 24 +++++--------------
 .../draw-app/properties/StationProperty.vue   | 16 +++----------
 .../properties/StopPositionProperty.vue       | 15 +++---------
 .../properties/TransponderProperty.vue        | 16 +++----------
 .../draw-app/properties/TurnoutProperty.vue   | 24 +++++--------------
 src/drawApp/commonApp.ts                      |  7 ------
 11 files changed, 38 insertions(+), 144 deletions(-)

diff --git a/src/components/draw-app/dialogs/KilometerConvertList.vue b/src/components/draw-app/dialogs/KilometerConvertList.vue
index 74a1044..d361b9b 100644
--- a/src/components/draw-app/dialogs/KilometerConvertList.vue
+++ b/src/components/draw-app/dialogs/KilometerConvertList.vue
@@ -51,7 +51,6 @@ import DraggableDialog from 'src/components/common/DraggableDialog.vue';
 import { QTable, useQuasar } from 'quasar';
 import { errorNotify, successNotify } from 'src/utils/CommonNotify';
 import {
-  CoordinateSystemOptions,
   deleteKilometerConvert,
   loadKilometerConvertList,
   sameTrendOptions,
@@ -160,15 +159,7 @@ function getSameTrendName(row: graphicData.KilometerConvert) {
 }
 
 function getKMName(km: KilometerSystem) {
-  let nameArr = [];
-  const findCoordinate = CoordinateSystemOptions.find((item) => {
-    return item.value == km.coordinateSystem;
-  });
-  if (findCoordinate) {
-    nameArr.push(findCoordinate.label);
-  }
-  nameArr.push(km.kilometer);
-  return nameArr.join('_');
+  return km.coordinateSystem + '_' + km.kilometer;
 }
 </script>
 
diff --git a/src/components/draw-app/properties/AxleCountingProperty.vue b/src/components/draw-app/properties/AxleCountingProperty.vue
index 4a123c4..999f0e7 100644
--- a/src/components/draw-app/properties/AxleCountingProperty.vue
+++ b/src/components/draw-app/properties/AxleCountingProperty.vue
@@ -22,16 +22,13 @@
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           style="margin-top: 10px"
           v-model="axleCountingModel.kilometerSystem.coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-input
           outlined
           style="margin-top: 10px"
@@ -138,12 +135,6 @@ const { data: axleCountingModel, onUpdate } = useFormData(
   new AxleCountingData(),
   drawStore.getDrawApp()
 );
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 
 const directionOptions = [
   { label: '左行', value: 0 },
diff --git a/src/components/draw-app/properties/CurvatureKiloMarkerProperty.vue b/src/components/draw-app/properties/CurvatureKiloMarkerProperty.vue
index 132544a..eaae250 100644
--- a/src/components/draw-app/properties/CurvatureKiloMarkerProperty.vue
+++ b/src/components/draw-app/properties/CurvatureKiloMarkerProperty.vue
@@ -10,12 +10,6 @@ const { data: kiloMarkerModel, onUpdate } = useFormData(
   drawStore.getDrawApp()
 );
 
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
@@ -28,15 +22,12 @@ const directionOptions = [
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-input
           outlined
           v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer"
@@ -58,16 +49,13 @@ const directionOptions = [
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           class="q-mt-lg"
           v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-input
           outlined
           v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer"
diff --git a/src/components/draw-app/properties/KilometerConvertConfig.vue b/src/components/draw-app/properties/KilometerConvertConfig.vue
index 018cc99..0f4d7cd 100644
--- a/src/components/draw-app/properties/KilometerConvertConfig.vue
+++ b/src/components/draw-app/properties/KilometerConvertConfig.vue
@@ -15,14 +15,11 @@
             <div class="text-subtitle1">坐标A</div>
           </q-card-section>
           <q-item-section no-wrap class="q-gutter-y-sm column">
-            <q-select
+            <q-input
               style="margin-top: 10px"
               v-model="data.kmA.coordinateSystem"
-              :options="CoordinateSystemOptions"
-              :map-options="true"
-              :emit-value="true"
               label="坐标系"
-            ></q-select>
+            ></q-input>
             <q-input
               style="margin-top: 10px"
               v-model.number="data.kmA.kilometer"
@@ -36,14 +33,11 @@
             <div class="text-subtitle1">坐标B</div>
           </q-card-section>
           <q-item-section no-wrap class="q-gutter-y-sm column">
-            <q-select
+            <q-input
               style="margin-top: 10px"
               v-model="data.kmB.coordinateSystem"
-              :options="CoordinateSystemOptions"
-              :map-options="true"
-              :emit-value="true"
               label="坐标系"
-            ></q-select>
+            ></q-input>
             <q-input
               style="margin-top: 10px"
               v-model.number="data.kmB.kilometer"
@@ -86,7 +80,6 @@ import {
   creatKilometerConvert,
   editKilometerConvert,
   sameTrendOptions,
-  CoordinateSystemOptions,
   loadKilometerConvertList,
 } from 'src/drawApp/commonApp';
 import { useDrawStore } from 'src/stores/draw-store';
diff --git a/src/components/draw-app/properties/SignalProperty.vue b/src/components/draw-app/properties/SignalProperty.vue
index 9ff63a9..1826786 100644
--- a/src/components/draw-app/properties/SignalProperty.vue
+++ b/src/components/draw-app/properties/SignalProperty.vue
@@ -18,16 +18,13 @@
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           class="q-mt-sm"
           v-model="signalModel.kilometerSystem.coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-select
           outlined
           class="q-mt-sm"
@@ -136,12 +133,6 @@ const DevicePortOptions = [
   { label: 'B端', value: graphicData.RelatedRef.DevicePort.B },
   { label: 'C端', value: graphicData.RelatedRef.DevicePort.C },
 ];
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
diff --git a/src/components/draw-app/properties/SlopeKiloMarkerProperty.vue b/src/components/draw-app/properties/SlopeKiloMarkerProperty.vue
index 789aec8..199fe5e 100644
--- a/src/components/draw-app/properties/SlopeKiloMarkerProperty.vue
+++ b/src/components/draw-app/properties/SlopeKiloMarkerProperty.vue
@@ -10,12 +10,6 @@ const { data: kiloMarkerModel, onUpdate } = useFormData(
   drawStore.getDrawApp()
 );
 
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
@@ -28,15 +22,12 @@ const directionOptions = [
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <QSelect
+        <q-input
           outlined
           v-model="kiloMarkerModel.kilometerSystem[0].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></QSelect>
+        ></q-input>
         <QInput
           outlined
           v-model.number="kiloMarkerModel.kilometerSystem[0].kilometer"
@@ -58,16 +49,13 @@ const directionOptions = [
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <QSelect
+        <q-input
           outlined
           class="q-mt-lg"
           v-model="kiloMarkerModel.kilometerSystem[1].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></QSelect>
+        ></q-input>
         <QInput
           outlined
           v-model.number="kiloMarkerModel.kilometerSystem[1].kilometer"
diff --git a/src/components/draw-app/properties/StationProperty.vue b/src/components/draw-app/properties/StationProperty.vue
index 8085c08..d131b70 100644
--- a/src/components/draw-app/properties/StationProperty.vue
+++ b/src/components/draw-app/properties/StationProperty.vue
@@ -21,16 +21,13 @@
       <q-item no-wrap class="q-gutter-y-sm column">
         <template v-if="stationModel.kilometerSystem">
           <div>公里标配置</div>
-          <q-select
+          <q-input
             outlined
             class="q-mt-md"
             v-model="stationModel.kilometerSystem.coordinateSystem"
-            :options="CoordinateSystemOptions"
-            :map-options="true"
-            :emit-value="true"
-            @update:model-value="onUpdate"
+            @blur="onUpdate"
             label="坐标系"
-          ></q-select>
+          ></q-input>
           <q-input
             outlined
             class="q-mt-md"
@@ -98,13 +95,6 @@ const optionsControl = [
   { label: '否', value: false },
 ];
 
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
-
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
diff --git a/src/components/draw-app/properties/StopPositionProperty.vue b/src/components/draw-app/properties/StopPositionProperty.vue
index 3a2a36c..017e961 100644
--- a/src/components/draw-app/properties/StopPositionProperty.vue
+++ b/src/components/draw-app/properties/StopPositionProperty.vue
@@ -22,16 +22,13 @@
       <q-item no-wrap class="q-gutter-y-sm column">
         <template v-if="stopPositionModel.kilometerSystem">
           <div>公里标配置</div>
-          <q-select
+          <q-input
             outlined
             class="q-mt-md"
             v-model="stopPositionModel.kilometerSystem.coordinateSystem"
-            :options="CoordinateSystemOptions"
-            :map-options="true"
-            :emit-value="true"
-            @update:model-value="onUpdate"
+            @blur="onUpdate"
             label="坐标系"
-          ></q-select>
+          ></q-input>
           <q-select
             outlined
             class="q-mt-md"
@@ -81,12 +78,6 @@ const { data: stopPositionModel, onUpdate } = useFormData(
   drawStore.getDrawApp()
 );
 const sectionList: { label: string; value: string }[] = reactive([]);
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
diff --git a/src/components/draw-app/properties/TransponderProperty.vue b/src/components/draw-app/properties/TransponderProperty.vue
index 878a6c1..7c91505 100644
--- a/src/components/draw-app/properties/TransponderProperty.vue
+++ b/src/components/draw-app/properties/TransponderProperty.vue
@@ -19,16 +19,13 @@
       <q-item no-wrap class="q-gutter-y-sm column">
         <template v-if="transponderModel.kilometerSystem">
           <div>公里标配置</div>
-          <q-select
+          <q-input
             outlined
             class="q-mt-md"
             v-model="transponderModel.kilometerSystem.coordinateSystem"
-            :options="CoordinateSystemOptions"
-            :map-options="true"
-            :emit-value="true"
-            @update:model-value="onUpdate"
+            @blur="onUpdate"
             label="坐标系"
-          ></q-select>
+          ></q-input>
           <q-input
             outlined
             class="q-mt-md"
@@ -129,13 +126,6 @@ const typeOptions = [
   { label: '预告应答器', value: transponderTypeEnum.IB },
 ];
 
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
-
 const directionOptions = [
   { label: '左行', value: 0 },
   { label: '右行', value: 1 },
diff --git a/src/components/draw-app/properties/TurnoutProperty.vue b/src/components/draw-app/properties/TurnoutProperty.vue
index d81cef5..206315a 100644
--- a/src/components/draw-app/properties/TurnoutProperty.vue
+++ b/src/components/draw-app/properties/TurnoutProperty.vue
@@ -18,16 +18,13 @@
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           class="q-mt-sm"
           v-model="turnoutModel.kilometerSystem[0].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-input
           outlined
           class="q-mt-sm"
@@ -51,16 +48,13 @@
     <q-list bordered separator class="rounded-borders">
       <q-item no-wrap class="q-gutter-y-sm column">
         <div>公里标配置</div>
-        <q-select
+        <q-input
           outlined
           class="q-mt-sm"
           v-model="turnoutModel.kilometerSystem[1].coordinateSystem"
-          :options="CoordinateSystemOptions"
-          :map-options="true"
-          :emit-value="true"
-          @update:model-value="onUpdate"
+          @blur="onUpdate"
           label="坐标系"
-        ></q-select>
+        ></q-input>
         <q-input
           outlined
           class="q-mt-sm"
@@ -145,12 +139,6 @@ import { useFormData } from 'src/components/DrawAppFormUtils';
 
 const drawStore = useDrawStore();
 const $q = useQuasar();
-const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 
 const { data: turnoutModel, onUpdate } = useFormData(
   new TurnoutData(),
diff --git a/src/drawApp/commonApp.ts b/src/drawApp/commonApp.ts
index b9cd957..37f28ce 100644
--- a/src/drawApp/commonApp.ts
+++ b/src/drawApp/commonApp.ts
@@ -454,13 +454,6 @@ export const sameTrendOptions = [
   { label: '相反', value: false },
   { label: '相同', value: true },
 ];
-// 公里标-坐标系
-export const CoordinateSystemOptions = [
-  { label: '车辆段', value: 'DEPOT' },
-  { label: '停车场', value: 'PARKING_LOT' },
-  { label: '正线', value: 'MAIN_LINE' },
-  { label: '换线', value: 'TRANSFER' },
-];
 // 公里标-方向
 export const directionOptions = [
   { label: '左行', value: 0 },