Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControlSpeed.vue

@@ -128,7 +128,7 @@ export default {
                     this.$emit('setOperate', { step: 1, success: true });
                     this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.loading = false;
                 this.$emit('setOperate', { step: 0, success: false });
                 this.doClose();
@@ -147,9 +147,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => { this.doClose(); });
-                this.doClose();
-            });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue

@@ -94,7 +94,7 @@ export default {
                     this.$emit('setOperate', { step: 1, success: true });
                     this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.loading = false;
                 this.$emit('setOperate', { step: 0, success: false });
                 this.doClose();
@@ -112,9 +112,7 @@ export default {
                     this.$emit('setOperate', { step: 0, success: false });
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => { this.doClose(); });
-                this.doClose();
-            });
         }
     }
 };

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

@@ -14,31 +14,31 @@
       <div style="width: 96%;">
         <el-form-item label="车 组 号:" label-width="95px" prop="trainCode">
           <el-select v-model="addModel.trainCode" filterable>
-                <el-option
+            <el-option
-                    v-for="train in trainList"
+              v-for="train in trainList"
-                    :key="train.groupNumber"
+              :key="train.groupNumber"
-                    :label="train.groupNumber"
+              :label="train.groupNumber"
-                    :value="train.code"
+              :value="train.code"
-                />
+            />
-            </el-select>
+          </el-select>
         </el-form-item>
         <el-form-item label="车 次 号:" label-width="95px" prop="tripNumber">
           <el-select v-model="addModel.tripNumber" filterable @change="tripNumberChange">
             <el-option
-                v-for="tripNum in tripNumberList"
+              v-for="tripNum in tripNumberList"
-                :key="tripNum"
+              :key="tripNum"
-                :label="tripNum"
+              :label="tripNum"
-                :value="tripNum"
+              :value="tripNum"
             />
-            </el-select>
+          </el-select>
         </el-form-item>
         <el-form-item label="服 务 号:" label-width="95px" prop="serviceNumber">
           <el-select v-model="addModel.serviceNumber" filterable>
             <el-option
-                v-for="serviceNumber in serviceNumberList"
+              v-for="serviceNumber in serviceNumberList"
-                :key="serviceNumber"
+              :key="serviceNumber"
-                :label="serviceNumber"
+              :label="serviceNumber"
-                :value="serviceNumber"
+              :value="serviceNumber"
             />
           </el-select>
         </el-form-item>
@@ -61,7 +61,6 @@ import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { getTripNumberList, getServiceNumbersByTripNum } from '@/api/simulation';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
-
 export default {
     // name: 'TrainMove',
     name: 'TrainAddPlan',
@@ -155,7 +154,8 @@ export default {
                     }
                 });
             }).catch(error => {
-                this.$messageBox(error.message);
+                console.log(error);
+                // this.$messageBox(error.message);
             });
             this.dialogShow = true;
             this.$nextTick(function () {

src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue

@@ -124,7 +124,7 @@ export default {
                         if (valid) {
                             this.doClose();
                         }
-                    }).catch(error => {
+                    }).catch(() => {
                         this.loading = false;
                         this.doClose();
                     });
@@ -143,7 +143,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue

@@ -136,7 +136,7 @@ export default {
                         if (valid) {
                             this.doClose();
                         }
-                    }).catch(error => {
+                    }).catch(() => {
                         this.loading = false;
                         this.doClose();
                         // this.$refs.noticeInfo.doShow(operate);
@@ -156,7 +156,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue

@@ -121,7 +121,7 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
-            }, 1000).catch((error) => {
+            }, 1000).catch(() => {
                 this.$refs.noticeInfo.doShow(operate);
             });
         }

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue

@@ -155,7 +155,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); this.model; });
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue

@@ -127,7 +127,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue

@@ -172,7 +172,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue

@@ -149,7 +149,7 @@ export default {
 				} else {
 					this.disabledSure = false;
 				}
-			}).catch((error) => {
+			}).catch(() => {
 				this.loading = false;
 				this.doClose();
 				this.$refs.noticeInfo.doShow(operate);

src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -149,7 +149,7 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.loading = false;
                 this.doClose();
                 this.$refs.noticeInfo.doShow(operate);
@@ -182,7 +182,7 @@ export default {
     }
 };
 </script>
-<style scoped rel="stylesheet/scss" lang="scss" scoped>
+<style scoped rel="stylesheet/scss" lang="scss">
     @import "src/styles/mixin.scss";
 
     /deep/ .el-radio {

src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue

@@ -109,7 +109,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
                 this.doClose();
             });
@@ -124,7 +124,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue

@@ -158,7 +158,7 @@ export default {
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -176,7 +176,7 @@ export default {
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
                 });
             } else {
@@ -198,7 +198,7 @@ export default {
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
                 });
             } else {
@@ -215,7 +215,7 @@ export default {
             this.loading = true;
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
                 this.loading = false;
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -230,7 +230,7 @@ export default {
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -246,7 +246,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
                 this.doClose();
             });
@@ -261,7 +261,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         },
         // 增删改函数处理
         operateUser(data) {

src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue

@@ -197,7 +197,6 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch(() => {
             });
         },
         // 请求站控
@@ -216,7 +215,6 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch((error) => {
             });
         },
         // 紧急站控
@@ -235,7 +233,6 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch(() => {
             });
         }
     }

src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue

@@ -137,7 +137,7 @@ export default {
                         } else {
                             // this.$refs.noticeInfo.doShow(operate);
                         }
-                    }).catch(error => {
+                    }).catch(() => {
                         this.loading = false;
                         this.doClose();
                         // this.$refs.noticeInfo.doShow(operate);
@@ -157,7 +157,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue

@@ -120,7 +120,7 @@ export default {
                         } else {
                             // this.$refs.noticeInfo.doShow(operate);
                         }
-                    }).catch(error => {
+                    }).catch(() => {
                         this.loading = false;
                         this.doClose();
                         // this.$refs.noticeInfo.doShow(operate);
@@ -140,7 +140,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue

@@ -137,7 +137,7 @@ export default {
                         } else {
                             // this.$refs.noticeInfo.doShow(operate);
                         }
-                    }).catch(error => {
+                    }).catch(() => {
                         this.loading = false;
                         this.doClose();
                         // this.$refs.noticeInfo.doShow(operate);
@@ -157,7 +157,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };

src/jmapNew/theme/foshan_01/menus/passiveDialog/control.vue

@@ -264,7 +264,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.$refs.noticeInfo.doShow(operate);
             });
         },
@@ -284,7 +284,7 @@ export default {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.$refs.noticeInfo.doShow(operate);
             });
         }

src/jmapNew/theme/haerbin_01/menus/dialog/trainInitPlan.vue

@@ -12,38 +12,38 @@
   >
     <div class="el-dialog-div">
       <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules" label-position="left">
-            <el-form-item prop="trainCode" label="车组号:">
+        trainCode" label="车组号:">
-                 <!--<el-input v-model="addModel.trainCode"/>-->
+          inCode"/>-->
-                <el-select v-model="addModel.trainCode" filterable>
+          rainCode" filterable>
-                    <el-option
+
-                        v-for="train in trainList"
+
-                        :key="train.groupNumber"
+
-                        :label="train.groupNumber"
+
-                        :value="train.code"
+
-                    />
+
-                </el-select>
+
-            </el-form-item>
+
-            <el-form-item label="车次号:" prop="tripNumber">
+        "车次号:" prop="tripNumber">
-               <!--<el-input v-model="addModel.tripNumber"/>-->
+          dModel.tripNumber"/>-->
-               <el-select v-model="addModel.tripNumber" @change="tripNumberChange" filterable>
+          del.tripNumber" filtefiltefiltefilt filtefilterable @change="tripNumberChange"
-                   <el-option
+
-                      v-for="tripNum in tripNumberList"
+
-                      :key="tripNum"
+
-                      :label="tripNum"
+
-                      :value="tripNum"
+
-                   />
+
-               </el-select>
+
-          </el-form-item>
+        item>
-          <el-form-item label="服务号:" prop="serviceNumber">
+        tem label="服务号:" prop="serviceNumber">
-              <el-select v-model="addModel.serviceNumber" filterable>
+          addModel.serviceNumber" filterable>
-                  <el-option
+
-                      v-for="serviceNumber in serviceNumberList"
+              t"
-                      :key="serviceNumber"
+
-                      :label="serviceNumber"
+
-                      :value="serviceNumber"
+
-                  />
+
-              </el-select>
+
-          </el-form-item>
+        item>
       </el-form>
     </div>
     <el-row justify="center" class="button-group">
@@ -150,7 +150,8 @@ export default {
                     }
                 });
             }).catch(error => {
-                this.$messageBox(error.message);
+                                                                            console.log(error);;
+                // this.$messageBox(error.message);
             });
             this.dialogShow = true;
             this.$nextTick(function () {
@@ -185,10 +186,11 @@ export default {
                             this.doClose();
                         }
                     }).catch(error => {
+                                          ;                  ;onsole.log(error);
                         this.loading = false;
                         this.doClose();
                         // this.$refs.noticeInfo.doShow(operate);
-                        this.$messageBox(error.message);
+                        // this.$messageBox(error.message);
                     });
                 } else {
                     return false;

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

@@ -155,7 +155,8 @@ export default {
                     }
                 });
             }).catch(error => {
-                this.$messageBox(error.message);
+				console.log(error);
+                // this.$messageBox(error.message);
             });
             this.dialogShow = true;
             this.$nextTick(function () {

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

@@ -155,7 +155,8 @@ export default {
                     }
                 });
             }).catch(error => {
-                this.$messageBox(error.message);
+				console.log(error);
+                // this.$messageBox(error.message);
             });
             this.dialogShow = true;
             this.$nextTick(function () {