大铁项目 修改车次 页面代码调整

src/jmapNew/theme/components/utils/menuOperate.js

@@ -506,6 +506,11 @@ export const menuOperate = {
             // 修改车次号 (大铁线路 车次号 车组号)
             operation: OperationEvent.Train.updateTrip.menu.operation,
             cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+        },
+        updateTripCommit:{
+            // 修改车次号 (大铁线路 车次号 车组号)
+            operation: OperationEvent.Train.updateTrip.confirm.operation,
+            cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
         }
     },
     CTC: {

src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue

@@ -174,7 +174,6 @@ export default {
                 } else {
                     this.messageTip1 = '请输入车次号';
                 }
-
             }
         },
         cancel() {

src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue

@@ -0,0 +1,165 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm updateTrip"
+    :title="title"
+    :visible.sync="show"
+    width="300px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="display: inline-block;margin-left:22px;">
+      <span class="tripNumberName">车次号:</span>
+      <div class="tripNumberClass">
+        <el-input v-model="tripNumber" size="mini" @blur="handleTripNumber" />
+        <div class="tripNumberTips">{{ messageTip1 }}</div>
+      </div>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="2">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
+  </el-dialog>
+</template>
+<script>
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
+export default {
+    name: 'UpdateTrip',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow:false,
+            tripNumber: '',
+            messageTip1:'',
+            loading: false
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.updateTrip.confirm.domId : '';
+        },
+        domIdChangeTripNumber() {
+            return this.dialogShow ? OperationEvent.Train.updateTrip.changeTripNumber.domId : '';
+        },
+        title() {
+            return '修改车次号';
+        }
+    },
+    methods: {
+        doShow(operate, tripNumber) {
+            this.tripNumber = tripNumber;
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        handleTripNumber() {
+            const figuresOfServiceMinNumber = 2;
+            const figuresOfServiceMaxNumber = 6;
+            // this.$store.state.map.mapConfig.figuresOfServiceNumber;
+            const tripNumber = this.tripNumber;
+            const judge = /^[a-zA-Z0-9]*[\d]$/.test(this.tripNumber);
+            if (judge) {
+                if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) {
+                    this.messageTip1 = '车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位';
+                } else {
+                    // this.tripNumber = tripNumber;
+                    this.messageTip1 = '';
+                }
+            } else {
+                this.tripNumber = '';
+                this.messageTip1 = '请输入车次号(最后一位数字)';
+            }
+        },
+        commit() {
+            const figuresOfServiceMinNumber = 2;
+            const figuresOfServiceMaxNumber = 6;
+            let result = false;
+            const tripNumber = this.tripNumber;
+            if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) {
+                result = false;
+            } else {
+                result = true;
+            }
+            if (this.tripNumber && result) {
+                const params = {
+                    tripNumber: this.tripNumber
+                };
+                this.messageTip1 = '';
+                this.loading = true;
+                commitOperate(menuOperate.Train.updateTripCommit, params, 2).then(({valid})=>{
+                    this.loading = false;
+                    if (valid) {
+                        this.doClose();
+                    }
+                }).catch(() => {
+                    this.loading = false;
+                    this.doClose();
+                    this.$refs.noticeInfo.doShow();
+                });
+
+            } else {
+                if (this.tripNumber) {
+                    this.messageTip1 = '该车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位';
+                } else {
+                    this.messageTip1 = '请输入车次号(最后一位数字)';
+                }
+            }
+
+        },
+        cancel() {
+            const operate = {
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.tripNumber = '';
+            this.$store.dispatch('training/emitTipFresh');
+        }
+
+    }
+};
+</script>
+<style rel="stylesheet/scss" lang="scss" scoped>
+.tripNumberClass{
+    display: inline-block;
+    width:140px
+}
+.tripNumberName{
+    margin-left: 5px;
+    height: 22px;
+    vertical-align: top;
+    margin-right:10px;
+    display: inline-block;
+}
+.tripNumberTips{
+    margin-top: 10px;
+    color: #f00;
+    font-size: 13px;
+    text-align: left;
+}
+</style>

src/jmapNew/theme/datie_02/menus/menuTrain.vue

@@ -9,7 +9,8 @@
     <train-delete-number ref="trainDeleteNumber" />
     <train-detail-info ref="trainDetailInfo" />
     <set-fault ref="setFault" pop-class="chengdou-03__systerm" />
-	<train-set-plan ref="trainSetPlan" />
+    <!-- <train-set-plan ref="trainSetPlan" /> -->
+    <update-trip ref="updateTrip" />
   </div>
 </template>
 
@@ -25,9 +26,10 @@ import TrainMoveNumber from './dialog/trainMoveNumber';
 import TrainCreateNumber from './dialog/trainCreateNumber';
 import TrainDeleteNumber from './dialog/trainDeleteNumber';
 import TrainDetailInfo from './dialog/trainDetailInfo';
-import TrainSetPlan from './dialog/trainSetPlan';
+// import TrainSetPlan from './dialog/trainSetPlan';
+import UpdateTrip from './dialog/updateTrip';
 import CancelMouseState from '@/mixin/CancelMouseState';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+// import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import { menuOperate, commitOperate, commitTrainSend } from '@/jmapNew/theme/components/utils/menuOperate';
@@ -44,7 +46,8 @@ export default {
         TrainDeleteNumber,
         TrainDetailInfo,
         SetFault,
-		TrainSetPlan
+        UpdateTrip
+        // TrainSetPlan
     },
     mixins: [
         CancelMouseState
@@ -62,18 +65,18 @@ export default {
             menu: [],
             menuNormal: {
                 Local: [
-					{
-						label: '设置计划车',
-						handler: this.setPlanTrain,
-						cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-					},
+                    // {
+                    // 	label: '设置计划车',
+                    // 	handler: this.setPlanTrain,
+                    // 	cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+                    // },
                 ],
                 Center: [
-					{
-						label: '设置计划车',
-						handler: this.setPlanTrain,
-						cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
-					}
+                    // {
+                    // 	label: '设置计划车',
+                    // 	handler: this.setPlanTrain,
+                    // 	cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+                    // }
                     // {
                     //     label: '新建车组号',
                     //     handler: this.createTrainNo
@@ -131,35 +134,35 @@ export default {
                 }
             ],
             menuDirective: [
-                 {
+                {
                     label: '修改车次号',
                     handler: this.modifyTripNumber
                 },
-				{
-					label: '切换驾驶模式',
-					children: [
-						{
-							label: '转AM-C模式',
-							handler: this.handlerApplyAmcMode
-						},
-						{
-							label: '转SM-C模式',
-							handler: this.handlerApplySmcMode
-						},
-						{
-							label: '转AM-I模式',
-							handler: this.handlerApplyAmiMode
-						},
-						{
-							label: '转SM-I模式',
-							handler: this.handlerApplySmiMode
-						},
-						{
-							label: '转RM模式',
-							handler: this.handlerApplyRmMode
-						}
-					]
-				},
+                {
+                    label: '切换驾驶模式',
+                    children: [
+                        {
+                            label: '转AM-C模式',
+                            handler: this.handlerApplyAmcMode
+                        },
+                        {
+                            label: '转SM-C模式',
+                            handler: this.handlerApplySmcMode
+                        },
+                        {
+                            label: '转AM-I模式',
+                            handler: this.handlerApplyAmiMode
+                        },
+                        {
+                            label: '转SM-I模式',
+                            handler: this.handlerApplySmiMode
+                        },
+                        {
+                            label: '转RM模式',
+                            handler: this.handlerApplyRmMode
+                        }
+                    ]
+                },
                 {
                     label: '确认运行至前方站',
                     handler: this.nextStation
@@ -176,22 +179,22 @@ export default {
                     label: '越红灯行驶',
                     handler: this.handleOverEedLight
                 },
-				// {
-				// 	label: '驾驶至',
-				// 	handler: this.handleDriveTo
-				// },
-				{
-					label: '换端',
-					handler: this.handleTurnDirection
-				},
+                // {
+                // 	label: '驾驶至',
+                // 	handler: this.handleDriveTo
+                // },
                 {
-					label: '发车',
-					handler: this.handleDepartTrain
-				},
+                    label: '换端',
+                    handler: this.handleTurnDirection
+                },
                 {
-					label: '停车',
-					handler: this.handleParkingTrain
-				}
+                    label: '发车',
+                    handler: this.handleDepartTrain
+                },
+                {
+                    label: '停车',
+                    handler: this.handleParkingTrain
+                }
             ],
             menuSpeed: [
                 {
@@ -341,21 +344,21 @@ export default {
                 this.$refs.noticeInfo.doShow();
             });
         },
-		// 设置计划车
-		setPlanTrain() {
-			const operate = {
-				start: true,
-				code: this.selected.code,
-				operation: OperationEvent.Train.editTrainId.menu.operation,
-				param: {}
-			};
-			this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					this.$refs.trainSetPlan.doShow(operate, this.selected);
-				}
-			});
-		},
+        // 设置计划车
+        // setPlanTrain() {
+        // 	const operate = {
+        // 		start: true,
+        // 		code: this.selected.code,
+        // 		operation: OperationEvent.Train.editTrainId.menu.operation,
+        // 		param: {}
+        // 	};
+        // 	this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+        // 		if (valid) {
+        // 			this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+        // 			this.$refs.trainSetPlan.doShow(operate, this.selected);
+        // 		}
+        // 	});
+        // },
         // 设计划车
         setPlanTrainId() {
             const operate = {
@@ -484,124 +487,124 @@ export default {
                 }
             });
         },
-		handlerApplyAmcMode() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Change_Preselection_Mode',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: { preselectionMode: 'AM_C' }
-			};
-			commitTrainSend(group, param).then(({ valid, operate }) => {
-			}).catch((error) => {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
-		handlerApplySmcMode() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Change_Preselection_Mode',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: { preselectionMode: 'SM_C' }
-			};
-			commitTrainSend(group, param).then(({ valid, operate }) => {
-			}).catch((error) => {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
-		handlerApplyAmiMode() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Change_Preselection_Mode',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: { preselectionMode: 'AM_I' }
-			};
-			commitTrainSend(group, param).then(({ valid, operate }) => {
-			}).catch((error) => {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
-		handlerApplySmiMode() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Change_Preselection_Mode',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: { preselectionMode: 'SM_I' }
-			};
-			commitTrainSend(group, param).then(({ valid, operate }) => {
-			}).catch((error) => {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
-		handlerApplyRmMode() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Change_Preselection_Mode',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: { preselectionMode: 'RM' }
-			};
-			commitTrainSend(group, param).then(({ valid, operate }) => {
-			}).catch((error) => {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
-		// 驾驶至（托管）
-		handleDriveTo() {
-			commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
-				if (valid) {
-					this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
-				}
-			});
-		},
-		// 换端
-		handleTurnDirection() {
-			const group = this.$route.query.group;
-			const param = {
-				commandType: 'Turn_Direction',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: {}
-			};
-			commitTrainSend(group, param).then(({valid, operate}) => {
-			}).catch((error)=> {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-		},
+        handlerApplyAmcMode() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Change_Preselection_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: { preselectionMode: 'AM_C' }
+            };
+            commitTrainSend(group, param).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        handlerApplySmcMode() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Change_Preselection_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: { preselectionMode: 'SM_C' }
+            };
+            commitTrainSend(group, param).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        handlerApplyAmiMode() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Change_Preselection_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: { preselectionMode: 'AM_I' }
+            };
+            commitTrainSend(group, param).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        handlerApplySmiMode() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Change_Preselection_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: { preselectionMode: 'SM_I' }
+            };
+            commitTrainSend(group, param).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        handlerApplyRmMode() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Change_Preselection_Mode',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: { preselectionMode: 'RM' }
+            };
+            commitTrainSend(group, param).then(({ valid, operate }) => {
+            }).catch((error) => {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+        // 驾驶至（托管）
+        handleDriveTo() {
+            commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
+                if (valid) {
+                    this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
+                }
+            });
+        },
+        // 换端
+        handleTurnDirection() {
+            const group = this.$route.query.group;
+            const param = {
+                commandType: 'Turn_Direction',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate}) => {
+            }).catch((error)=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+        },
         handleDepartTrain() {
             const group = this.$route.query.group;
-			const param = {
-				commandType: 'Depart_Train',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: {}
-			};
-			commitTrainSend(group, param).then(({valid, operate}) => {
-			}).catch((error)=> {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
+            const param = {
+                commandType: 'Depart_Train',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate}) => {
+            }).catch((error)=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
         },
-        handleParkingTrain(){
+        handleParkingTrain() {
             const group = this.$route.query.group;
-			const param = {
-				commandType: 'Parking_Train',
-				targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
-				params: {}
-			};
-			commitTrainSend(group, param).then(({valid, operate}) => {
-			}).catch((error)=> {
-				console.error(error);
-				this.$refs.noticeInfo.doShow();
-			});
-            
+            const param = {
+                commandType: 'Parking_Train',
+                targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+                params: {}
+            };
+            commitTrainSend(group, param).then(({valid, operate}) => {
+            }).catch((error)=> {
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
+            });
+
         },
-        modifyTripNumber(){
+        modifyTripNumber() {
             commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.updateTrip.doShow(operate, oldTripNumber);
+                    this.$refs.updateTrip.doShow(operate, this.selected.tripNumber);
                 }
             });
         },