From c83cf31bf3df7234c878bc78d3f360968a23df4f Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Thu, 9 Jun 2022 17:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=93=81=E9=A1=B9=E7=9B=AE=20?=
 =?UTF-8?q?=E8=A1=8C=E8=BD=A6=E6=97=A5=E5=BF=97=20=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=BD=A6=E6=AC=A1=E5=8F=B7=20=20=E4=BB=A3=E7=A0=81=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/theme/components/utils/menuOperate.js     |  5 +++++
 .../datie_02/menus/dialog/modifyAdjacentStation.vue   | 10 +++++-----
 src/jmapNew/theme/datie_02/menus/runplanPane.vue      | 11 ++++++++---
 src/scripts/cmdPlugin/CommandEnum.js                  |  3 ++-
 src/scripts/cmdPlugin/OperationHandler.js             |  7 +++++++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 279e5cab7..c03ff3e9f 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -553,6 +553,11 @@ export const menuOperate = {
         modifyAdjacentStation:{
             operation: OperationEvent.CTCCommand.modifyAdjacentStation.menu.operation,
             cmdType: CMD.CTC.CTC_MODIFY_ADJACENT_STATION
+        },
+        // 修改车次号(大铁CTC)
+        modifyTripNumber:{
+            operation: OperationEvent.CTCCommand.modifyTripNumber.menu.operation,
+            cmdType: CMD.CTC.CTC_MODIFY_TRIP_NUMBER
         }
     }
 
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
index d0aba1013..38132058d 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/modifyAdjacentStation.vue
@@ -26,10 +26,10 @@
             :value="item.code"
           />
         </el-select>
-        <span>站驶来</span>
+        <div style="display:inline-block">站驶来</div>
       </div>
       <div class="adjacentStationEnd">
-        <span>驶向</span>
+        <div style="display:inline-block">驶向</div>
         <el-select
           v-model="model.arriveStationCode"
           placeholder=""
@@ -43,7 +43,7 @@
             :value="item.code"
           />
         </el-select>
-        <span>站</span>
+        <div style="display:inline-block">站</div>
       </div>
     </div>
     <el-row justify="center" class="button-group">
@@ -101,8 +101,8 @@ export default {
         doShow(row) {
             this.model.stationCode = row.stationCode;
             this.model.runPlanCode = row.code;
-            this.model.arriveStationCode = row.arriveStationCode || '';
-            this.model.departStationCode = row.departStationCode || '';
+            this.model.arriveStationCode = (row.arriveRunPlan && row.arriveRunPlan.stationCode) || '';
+            this.model.departStationCode = (row.departRunPlan && row.departRunPlan.stationCode) || '';
             this.tripNumber = row.tripNumber;
             this.dialogShow = true;
             this.$nextTick(function () {
diff --git a/src/jmapNew/theme/datie_02/menus/runplanPane.vue b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
index bede115ae..cf15031b5 100644
--- a/src/jmapNew/theme/datie_02/menus/runplanPane.vue
+++ b/src/jmapNew/theme/datie_02/menus/runplanPane.vue
@@ -464,6 +464,7 @@
     <send-runplan ref="sendRunplan" @closeFlash="closeFlash" />
     <modify-adjacent-station ref="modifyAdjacentStation" @clearRpRow="clearRpRow" />
     <delete-runplan ref="deleteRunplan" @clearRpRow="clearRpRow" />
+    <modify-trip-number ref="modifyTripNumber" @clearRpRow="clearRpRow" />
   </div>
 </template>
 <script>
@@ -482,13 +483,15 @@ import Rph from '@/assets/ctc_icon/rph.png';
 import SendRunplan from './dialog/sendRunplan';
 import DeleteRunplan from './dialog/deleteRunplan';
 import ModifyAdjacentStation from './dialog/modifyAdjacentStation';
+import ModifyTripNumber from './dialog/modifyTripNumber';
 import { mapGetters } from 'vuex';
 export default {
     name:'RunplanPane',
     components: {
         SendRunplan,
         DeleteRunplan,
-        ModifyAdjacentStation
+        ModifyAdjacentStation,
+        ModifyTripNumber
     },
     data() {
         return {
@@ -638,8 +641,10 @@ export default {
             this.rpMenuPopShow = false;
         },
         // 修改车次号
-        modifyTripNumber() {
-
+        modifyTripNumber(event) {
+            event.stopPropagation();
+            this.rpMenuPopShow = false;
+            this.$refs.modifyTripNumber.doShow(this.currentRow);
         },
         // 修改相关邻站
         modifyAdjacentStation(event) {
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index c395be8c9..90e4d8e8c 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -392,6 +392,7 @@ export default {
         CTC_MODIFY_TRACK_SECTION:{value: 'CTC_MODIFY_TRACK_SECTION', label: '修改股道'},
         CTC_BATCH_MODIFY_RUN_PLAN:{value: 'CTC_BATCH_MODIFY_RUN_PLAN', label: '批量修改股道'},
         CTC_REMOVE_RUN_PLAN:{value: 'CTC_REMOVE_RUN_PLAN', label: '移除行车日志'},
-        CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'}
+        CTC_MODIFY_ADJACENT_STATION:{value: 'CTC_MODIFY_ADJACENT_STATION', label: '修改邻站信息'},
+        CTC_MODIFY_TRIP_NUMBER:{value: 'CTC_MODIFY_TRIP_NUMBER', label: '修改车次号(大铁CTC)'}
     }
 };
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index ab132a88d..d309802e9 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3694,6 +3694,13 @@ export const OperationEvent = {
     			operation: '1113',
                 domId: '_Tips-CTC-modifyAdjacentStation-Menu{TOP}'
             }
+        },
+        // 修改车次号(大铁CTC)
+        modifyTripNumber:{
+            menu: {
+                operation: '1114',
+                domId: '_Tips-CTC-modifyTripNumber-Menu{TOP}'
+            }
         }
     }