From 31954a545d22930bba6e0bc2431bde412e517de4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Fri, 18 Dec 2020 14:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/haerbin_01/menus/dialog/trainControl.vue     | 10 +++++-----
 src/jmapNew/theme/haerbin_01/menus/menuButton.vue      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
index e524d6151..a7c2c3146 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
@@ -29,7 +29,7 @@
           </el-table-column>
           <el-table-column prop="tripNumber" label="车次号">
             <template slot-scope="scope">
-              <span>{{ scope.row.serviceNumber+scope.row.tripNumber+scope.row.destinationCode }}</span>
+              <span>{{ scope.row.serviceNumber+scope.row.destinationCode+(scope.row.tripNumber.substring(1)) }}</span>
             </template>
           </el-table-column>
           <el-table-column prop="groupNumber" label="车组号" />
@@ -52,7 +52,7 @@
             </el-table-column>
             <el-table-column prop="tripNumber" label="车次号">
               <template slot-scope="scope">
-                <span>{{ scope.row.destinationCode+scope.row.serviceNumber+scope.row.tripNumber }}</span>
+                <span>{{ scope.row.destinationCode+scope.row.serviceNumber+(scope.row.tripNumber.substring(1)) }}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -157,7 +157,7 @@ export default {
             if (device && device.code && device.deviceType === 'TRAIN') {
                 this.tempTableData = [device];
                 this.sectionCode = device.sectionModel.name;
-                this.tripNum = device.destinationCode + device.serviceNumber + device.tripNumber;
+                this.tripNum = device.destinationCode + device.serviceNumber + (device.tripNumber.substring(1));
                 this.groupNum = device.groupNumber;
             }
         }
@@ -186,10 +186,10 @@ export default {
         },
         commit() {
             this.newTripNumError = false;
-            if (this.newTripNum && this.newTripNum.length === 9) {
+            if (this.newTripNum && this.newTripNum.length === 8) {
                 const params = {
                     groupNumber: this.groupNum,
-                    tripNumber: this.newTripNum.slice(6, 9),
+                    tripNumber: '0' + this.newTripNum.slice(6, 8),
                     serviceNumber: this.newTripNum.slice(3, 6)
                 };
                 const step = {
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index 76129d247..556527037 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -794,7 +794,7 @@ export default {
             this.standParamList = this.$store.state.training.prdType === '01' ? [] : [
                 { name: '扣车', cmdType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN, operate: OperationEvent.StationStand.setDetainTrain.menuButton, show: false },
                 { name: '取消扣车', cmdType: CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, operate: OperationEvent.StationStand.cancelDetainTrain.menuButton, show: false },
-                { name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false, securityCommand: true },
+                { name: '越站', cmdType: CMD.Stand.CMD_STAND_SET_JUMP_STOP, operate: OperationEvent.StationStand.setJumpStop.menuButton, show: false },
                 { name: '取消越站', cmdType: CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP, operate: OperationEvent.StationStand.cancelJumpStop.menuButton, show: false, securityCommand: true }
             ];
             this.directionRodParamList = [