新版北京一号线 新建计划车指令代码修改

src/jmapNew/theme/beijing_01/menus/dialog/trainAddPlan.vue

@@ -4,13 +4,29 @@
        <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
       <div style="width: 96%;">
         <el-form-item label="车 组 号:" label-width="95px" prop="trainCode">
-          <el-input v-model="addModel.trainCode" />
+          <!-- <el-input v-model="addModel.trainCode" /> -->
-        </el-form-item>
+          <el-select v-model="addModel.trainCode" filterable>
-        <el-form-item label="服 务 号:" label-width="95px" prop="serverNumber">
+                <el-option
-          <el-input v-model="addModel.serverNumber" />
+                    v-for="train in trainList"
+                    :key="train.groupNumber"
+                    :label="train.groupNumber"
+                    :value="train.code"
+                />
+            </el-select>
         </el-form-item>
         <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
-          <el-input v-model="addModel.tripNumber" />
+          <!-- <el-input v-model="addModel.tripNumber" /> -->
+            <el-select v-model="addModel.tripNumber" @change="tripNumberChange">
+                <el-option
+                    v-for="tripNum in tripNumberList"
+                    :key="tripNum"
+                    :label="tripNum"
+                    :value="tripNum"
+                />
+            </el-select>
+        </el-form-item>
+        <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
+          <el-input v-model="addModel.serviceNumber" />
         </el-form-item>
       </div>
     </el-form>
@@ -29,6 +45,7 @@
 import { mapGetters } from 'vuex';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
+import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
 
 export default {
     // name: 'TrainMove',
@@ -39,21 +56,21 @@
         return {
             trainNoList: [],
             selected: null,
+            tripNumberList:  [],
             addModel: {
                 trainCode: '', // 车组号
-                serverNumber: '', // 服务号
+                serviceNumber: '', // 服务号
                 tripNumber: '' // 车次号
             },
-
             rules: {
                 trainCode: [
-                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                    { required: true, message: '请输入车组号', trigger: 'change' }
                 ],
-                serverNumber: [
+                serviceNumber: [
-                    { required: true, message: '请输入服务号', trigger: 'change' }
+                    { required: true, message: '请输入服务号', trigger: 'blur' }
                 ],
                 tripNumber: [
-                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                    { required: true, message: '请输入车次号', trigger: 'change' }
                 ]
             },
             dialogShow: false,
@@ -62,7 +79,9 @@
     },
     computed: {
         ...mapGetters('map', [
-                'stationStandList'
+            'trainList',
+            'stationStandList',
+            'trainWindowSectionCode'
         ]),
         show() {
             return this.dialogShow && !this.$store.state.menuOperation.break;
@@ -83,12 +102,30 @@
         })
     },
     methods: {
+        tripNumberChange(tripNumber) {
+            getServiceNumbersByTripNum(this.$route.query.group, tripNumber).then(resp => {
+                this.serviceNumber = resp.data;
+            });
+        },
         doShow(operate, selected) {
             this.selected = selected;
             //如果不是断点激活，则需要对初始值进行初始化
             if (!this.dialogShow) {
 
             }
+            this.addModel = {
+                trainCode:'',
+                tripNumber:'',
+                serviceNumber:''
+            };
+            getTripNumberList(this.$route.query.group).then(resp => {
+                this.tripNumberList = [];
+                resp.data.forEach(item => {
+                    if (!this.tripNumberList.includes(item)) {
+                        this.tripNumberList.push(item);
+                    }
+                });
+            });
             this.dialogShow = true;
             this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
@@ -99,7 +136,7 @@
             this.dialogShow = false;
             this.$store.dispatch('training/emitTipFresh');
             this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
+            // mouseCancelState(this.selected);
         },
         commit() {
             this.$refs['form'].validate((valid) => {
@@ -110,7 +147,7 @@
                         cmdType: CMD.TrainWindow.CMD_Train_Init_Plan,
                         param: {
                             trainCode: this.addModel.trainCode, // 车组号
-                                serverNumber: this.addModel.serverNumber, // 服务号
+                            serviceNumber: this.addModel.serviceNumber, // 服务号
                             tripNumber: this.addModel.tripNumber // 车次号
                         }
                     }
@@ -133,7 +170,6 @@
         },
         cancel() {
             let operate = {
-                    type: MapDeviceType.Train.type,
                 operation: OperationEvent.Command.cancel.menu.operation,
             }