Merge branch 'dev' into test

src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue

@@ -57,6 +57,7 @@
           :id="domIdTrainNumber"
           v-model="formModel.category"
           filterable
+          :disabled="true"
         >
           <el-option
             v-for="item in categoryList"
@@ -98,9 +99,7 @@ export default {
 		return {
 			trainList: [],
 			categoryList: [
-				{ name: 'MM', value: '01' },
+				{ name: 'MM', value: '01' }
-				{ name: 'BB', value: '02' },
-				{ name: 'AA', value: '03' }
 			],
 			formModel: {
 				tripNumber: '',
@@ -262,7 +261,8 @@ export default {
 					tripNumber: val,
 					trainType: this.formModel.trainType,
 					serviceNumber: '',
-					targetCode: ''
+					targetCode: '',
+					category: 'MM'
 				};
 			}
 		}
@@ -293,7 +293,8 @@ export default {
 				tripNumber: `${model.directionCode}${model.tripNumber}`,
 				trainType: model.type,
 				serviceNumber: model.serviceNumber,
-				targetCode: model.targetCode
+				targetCode: model.targetCode,
+				category: 'MM'
 			};
 
 			/** 加载列车数据*/
@@ -369,7 +370,8 @@ export default {
 							tripNumber: tripNumber,
 							trainType: this.formModel.trainType,
 							serviceNumber: response.data.serviceNumber,
-							targetCode: response.data.targetCode
+							targetCode: response.data.targetCode,
+							category: 'MM'
 						};
 						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
 					} else {
@@ -378,7 +380,8 @@ export default {
 							tripNumber: tripNumber,
 							trainType: this.formModel.trainType,
 							serviceNumber: '',
-							targetCode: ''
+							targetCode: '',
+							category: 'MM'
 						};
 					}
 				}