From 66b240b674c174f1fb930655c8a5322ff6e668e2 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Mon, 28 Aug 2023 14:32:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E8=BD=A6=E6=80=BB?=
 =?UTF-8?q?=E9=95=BF=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ProjectLinkApi.ts                     |  2 +-
 src/api/Simulation.ts                         |  2 +
 .../draw-app/dialogs/AddTrainDialog.vue       | 39 +++++++++++++++++--
 src/drawApp/graphics/SectionInteraction.ts    | 10 +++--
 src/pages/ProjectManage.vue                   |  2 +
 src/pages/TrainModelManage.vue                | 12 ++----
 6 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/api/ProjectLinkApi.ts b/src/api/ProjectLinkApi.ts
index 03f1542..48a6425 100644
--- a/src/api/ProjectLinkApi.ts
+++ b/src/api/ProjectLinkApi.ts
@@ -55,7 +55,7 @@ export async function getProjectLinkInfo(id: number): Promise<LinkInfo> {
  */
 export async function getProjectLinkTrainSizeByMapId(
   id: number
-): Promise<TrainSizeInfo> {
+): Promise<TrainSizeInfo[]> {
   const response = await api.get(`${UriBase}/mapInfo/trainSize/${id}`);
   return response.data;
 }
diff --git a/src/api/Simulation.ts b/src/api/Simulation.ts
index c132518..7240edc 100644
--- a/src/api/Simulation.ts
+++ b/src/api/Simulation.ts
@@ -27,6 +27,7 @@ export async function destroySimulation(data: { simulationId: string }) {
  * @param id 区段或者道岔的索引
  * @param devicePort 道岔的端口
  * @param headOffset 偏移量（区段从A端为偏移原点，道岔从岔芯为偏移原点）
+ * @param trainLength 列车总长
  */
 export async function addTrain(data: {
   simulationId: string;
@@ -34,6 +35,7 @@ export async function addTrain(data: {
   id: string;
   devicePort?: string;
   headOffset: number;
+  trainLength?: number;
 }) {
   const response = await api.post(`${UriBase}/train/add`, data);
   return response.data;
diff --git a/src/components/draw-app/dialogs/AddTrainDialog.vue b/src/components/draw-app/dialogs/AddTrainDialog.vue
index be0fb05..09ca166 100644
--- a/src/components/draw-app/dialogs/AddTrainDialog.vue
+++ b/src/components/draw-app/dialogs/AddTrainDialog.vue
@@ -12,7 +12,7 @@
           v-model="props.dev.code"
         />
       </q-card-section>
-      <q-card-section class="q-pt-none">
+      <q-card-section class="q-py-none">
         <q-input
           type="number"
           dense
@@ -30,18 +30,29 @@
           v-model="dir"
           label="运行方向"
           dense
+          outlined
           :options="dirOptions"
           emitValue
           mapOptions
         >
         </q-select>
       </q-card-section>
+      <q-card-section>
+        <q-select
+          v-model="trainLength"
+          label="列车总长度(mm)"
+          dense
+          outlined
+          :options="lengthOptions"
+        >
+        </q-select>
+      </q-card-section>
       <q-card-actions align="right" class="text-primary">
         <q-btn flat label="取消" @click="onDialogCancel" v-close-popup />
         <q-btn
           flat
           label="确认"
-          @click="onDialogOK({ dir, offset })"
+          @click="onDialogOK({ dir, offset, trainLength })"
           v-close-popup
         />
       </q-card-actions>
@@ -51,9 +62,11 @@
 
 <script setup lang="ts">
 import { useDialogPluginComponent } from 'quasar';
+import { getProjectLinkTrainSizeByMapId } from 'src/api/ProjectLinkApi';
 import { Section } from 'src/graphics/section/Section';
 import { Turnout } from 'src/graphics/turnout/Turnout';
-import { ref } from 'vue';
+import { onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
 const props = defineProps({
   dev: {
@@ -78,5 +91,25 @@ const { dialogRef, onDialogOK, onDialogCancel } = useDialogPluginComponent();
 
 const offsetRules = (val: number) =>
   (val >= 0 && val <= props.kmLength) || `偏移量在0到${props.kmLength}之间！`;
+
+const route = useRoute();
+const lengthOptions = ref<string[]>([]);
+const trainLength = ref('');
+onMounted(() => {
+  const mapId = route.query.mapId as string;
+  if (mapId) {
+    getLengthOption(+mapId);
+  }
+});
+
+function getLengthOption(mapId: number) {
+  getProjectLinkTrainSizeByMapId(mapId).then((res) => {
+    res.forEach((item) => {
+      if (!lengthOptions.value.includes(item.total_length + '')) {
+        lengthOptions.value.push(item.total_length + '');
+      }
+    });
+  });
+}
 </script>
 <style scoped></style>
diff --git a/src/drawApp/graphics/SectionInteraction.ts b/src/drawApp/graphics/SectionInteraction.ts
index 3683b29..2304a90 100644
--- a/src/drawApp/graphics/SectionInteraction.ts
+++ b/src/drawApp/graphics/SectionInteraction.ts
@@ -180,13 +180,17 @@ export class SectionOperateInteraction extends GraphicInteractionPlugin<Section>
         componentProps: { dev: section, kmLength: d },
         cancel: true,
         persistent: true,
-      }).onOk((data: { offset: number; dir: 1 | 0 }) => {
-        addTrain({
+      }).onOk((data: { offset: number; dir: 1 | 0; trainLength: string }) => {
+        const params = {
           simulationId,
           up: !!data.dir,
           id: section.datas.index + '',
           headOffset: data.offset,
-        })
+        };
+        if (data.trainLength) {
+          Object.assign(params, { trainLength: +data.trainLength });
+        }
+        addTrain(params)
           .then(() => {
             successNotify('添加列车成功！');
           })
diff --git a/src/pages/ProjectManage.vue b/src/pages/ProjectManage.vue
index d596b25..072c452 100644
--- a/src/pages/ProjectManage.vue
+++ b/src/pages/ProjectManage.vue
@@ -115,6 +115,7 @@
             <q-select
               outlined
               class="q-mt-md"
+              use-chips
               v-model="editLinkInfo.mids"
               :options="midsOptions"
               multiple
@@ -127,6 +128,7 @@
             <q-select
               outlined
               class="q-mt-md"
+              use-chips
               v-model="editLinkInfo.sids"
               :options="sidsOptions"
               multiple
diff --git a/src/pages/TrainModelManage.vue b/src/pages/TrainModelManage.vue
index 5bcce8b..1119c0d 100644
--- a/src/pages/TrainModelManage.vue
+++ b/src/pages/TrainModelManage.vue
@@ -174,7 +174,7 @@
                 />
                 <q-input
                   outlined
-                  label="车厢长度"
+                  label="车厢长度(mm)"
                   v-model.number="sizeEditInfo.carriage_length"
                   type="number"
                   lazy-rules
@@ -182,7 +182,7 @@
                 />
                 <q-input
                   outlined
-                  label="总长度"
+                  label="总长度(mm)"
                   v-model.number="sizeEditInfo.total_length"
                   type="number"
                   lazy-rules
@@ -457,10 +457,6 @@ async function modelOnRequest(props: any) {
     modelPagination.value.descending = descending;
     modelRows.splice(0, modelRows.length, ...(pageData.records as []));
   } catch (err) {
-    console.log(
-      '🚀 ~ file: TrainModelManage.vue:441 ~ modelOnRequest ~ err:',
-      err
-    );
     const error = err as ApiError;
     $q.notify({
       type: 'negative',
@@ -563,14 +559,14 @@ const sizeColumnDefs: QTableColumn[] = [
   },
   {
     name: 'carriage_length',
-    label: '车厢长度',
+    label: '车厢长度(mm)',
     field: 'carriage_length',
     required: true,
     align: 'center',
   },
   {
     name: 'total_length',
-    label: '总长度',
+    label: '总长度(mm)',
     field: 'total_length',
     required: true,
     align: 'center',