merge

src/api/management/user.js

@@ -137,13 +137,6 @@ export function getUserinfoPassword(id, data) {
     });
 }
 
-// 获取当前用户数量
-export function getOnlineNmuber() {
-    return request({
-        url: `/api/cache/onlineUser`,
-        method: 'get'
-    });
-}
 // 生成线下环境用户
 export function generateOfflineUser(data) {
     return request({

src/components/QuillEditor/index.vue

@@ -188,6 +188,20 @@ export default {
     },
     mounted() {
         this.content = this.value;
+        const that = this;
+        document.addEventListener('click', (e) => {
+            const emojiElem = document.getElementById('emoji-palette');
+            const emojiButtonList = document.getElementsByClassName('ql-emoji');
+            let flag = true;
+            for (let i = 0; i < emojiButtonList.length; i++) {
+                if (emojiButtonList[i].contains(e.target)) {
+                    flag = false;
+                }
+            }
+            if (emojiElem && !emojiElem.contains(e.target) && flag) {
+                that.closeEmoji();
+            }
+        });
     },
     methods: {
         onChange(e) {
@@ -209,6 +223,11 @@ export default {
         },
         setContents(val) {
             this.$refs.editor.quill.setContents(val);
+        },
+        closeEmoji() {
+            const ele_emoji_plate = document.getElementById('emoji-palette');
+            document.getElementById('emoji-close-div').style.display = 'none';
+            if (ele_emoji_plate) { ele_emoji_plate.remove(); }
         }
     }
 };
@@ -226,6 +245,20 @@ export default {
 				left: -30px;
 			}
 		}
+		/deep/ #emoji-palette{
+			top: -215 !important;
+			left: 0 !important;
+			max-width: 550px;
+			width: 550px;
+			#tab-toolbar{ text-align: left}
+		}
+	}
+	/deep/ #emoji-palette{
+		top: -215px !important;
+		left: 850px !important;
+		max-width: 550px;
+		width: 550px;
+		#tab-toolbar{ text-align: left}
+		#tab-panel{ height:175px}
 	}
-
 </style>

src/jmapNew/config/skinCode/fuzhou_01.js

@@ -646,7 +646,7 @@ class SkinCode extends defaultStyle {
                 trainHeadArrowOffsetX: 2 // 列车车头三角偏移
             },
             common: {
-                trainHeight: 17, // 列车高度
+                trainHeight: 10, // 列车高度
                 trainHeadDistance: 2, // 列车和车头之间的间距
                 trainWidth: 76, // 列车长度
                 trainTextFontSize: 10, // 列车字号

src/jmapNew/constant/deviceState.js

@@ -125,7 +125,7 @@ deviceState[deviceType.StationStand] = {
     assignSkip: 0, // 是否指定跳停
     runLevelTime: 0, // 区间运行时间 自动为 0
     parkingTime: 0, // 站台停车时间 自动为0
-
+    num:0, // 站台上等车人数
     // /** 折返策略*/
     // reentryStrategy: {
     //     Default: '01',			/** 默认（缺省值）*/
@@ -246,7 +246,9 @@ deviceState[deviceType.Train] = {
     /** 列车精确位置 （成都一号线使用）*/
     offsetp:0,
     /** 列车所在物理区段 */
-    physicalCode:''
+    physicalCode:'',
+    /** 列车上的人数 */
+    num:0
 
 };
 

src/jmapNew/constant/stateTransition.js

@@ -24,7 +24,8 @@ class Status {
             assignSkip: device.assignSkip, // 是否指定跳停
             runLevelTime: device.runLevelTime, // 区间运行时间 自动为 0
             parkingTime: device.parkingTime, // 站台停车时间 自动为0
-            fault: device.fault /** 非故障*/
+            fault: device.fault, /** 非故障*/
+            num:device.num
         };
     }
     handleSection(device) {
@@ -94,7 +95,8 @@ class Status {
             jump: device.jump, /** 是否跳停 */
             hold: device.hold, /** 是否扣车 */
             offsetp:device.offsetp, /** 列车精确位置 （成都一号线使用）*/
-            physicalCode:device.physicalCode /** 列车所在物理区段 */
+            physicalCode:device.physicalCode, /** 列车所在物理区段 */
+            num:device.num /** 列车上的人数*/
         };
     }
     handleStation(device) {

src/jmapNew/shape/StationStand/safeStand/ESolidStand.js

@@ -41,6 +41,8 @@ class ESolidStand extends Group {
 
     setState(model) {
         const style = this.model.style;
+        const path = window.location.href;
+        if (!path.includes('/practiceDisplay')) {
             // 列车跳停
             model.assignSkip && this.setColor(style.StationStand.solidStand.designatedJumpStopColor);
             // 全部跳停
@@ -49,6 +51,24 @@ class ESolidStand extends Group {
             model.trainParking && this.setColor(style.StationStand.solidStand.stopColor);
             // 紧急停车
             model.emergencyClosed && this.setColor(this.style.StationStand.solidStand.spareColor);
+        } else {
+            this.handlePassagerColor(model.num);
+        }
+    }
+
+    handlePassagerColor(num) {
+        if (num && num > 0) {
+            const passagerNum = parseInt(num);
+            if (passagerNum < 40) {
+                this.setColor('#29a909');
+            } else if (passagerNum < 80 && passagerNum >= 40) {
+                this.setColor('#ffa500');
+            } else {
+                this.setColor('#F00');
+            }
+        } else {
+            this.setColor('#29a909');
+        }
     }
 }
 

src/jmapNew/shape/Train/EMouse.js

@@ -47,12 +47,12 @@ class EMouse extends Group {
             direction = this.device.model.right != 1;
         }
         if (LangStorage.getLang() == 'en') {
-            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m`;
+            text = ` The planned train: ${trainType} \n Table No.: ${this.device.model.serviceNumber} \n Train Trip No.: ${this.device.model.tripNumber}\n Destination: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n Train No.: ${this.device.model.groupNumber}\n Early or late: ${destinationText}\n Direction: ${direction ? 'up' : 'down'}\n Crew No.: \n Start Station: \n Terminal Station: \n Occupied Track: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n Current Station: \n Train-ground communication: normal \n Operation Speed level: 4 \n Detained: ${this.device.model.hold ? 'Detained' : 'Normal'}\n \n 跳停状态: ${this.device.model.jump ? 'Skip to continue moving' : 'Normal'}Stationary: ${!this.device.model.stop ? 'No' : 'Yes'}\n Blocked: No \n Speed: ${this.device.model.speed || 0} km/h \n Authorized Distance: ${this.device.model.maLen || 0} m\nNumber of people: ${this.device.model.num ? this.device.model.num : 0}`;
         } else {
             if (Vue.prototype.$jlmap.lineCode == '11' || Vue.prototype.$jlmap.lineCode == '10') {
                 text = `列车类型: ${trainType}\n来\0\0\0\0源:人工标记\n车\0组\0号: ${this.device.model.groupNumber}\n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\nATP报告方向: ${direction ? '上行' : '下行'}\n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车次通信: 通信车\n运行时间: \n停站时间: \n扣车状态: ${ this.device.model.hold ? '扣车' : '正常'}\n车载扣车: 不执行\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'}\n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车状态: ${this.device.model.runLevel || 'CTC'}车\n最高信号系统控制: CTC\n驾驶模式: ${this.device.model.driveMode}模式\n最高ATP模式: AM\nATP1状态: 激活\nATP2状态: 备用\n速度: ${this.device.model.speed || 0} km/h\n车门状态: ${this.device.model.speed ? '关闭' : direction ? '左开右关' : '左关右开'}\n制动状态: 无紧急制动\n停车保证: 可保证停车\n站台无法进入: 否\n前方站台停车点: 中间\n折法策略: \n折返状态: \n屏蔽门开门许可: 是\n运营里程: 无效\n总重量: 196T\n车长: 11860cm\n列车编组: 1`;
             } else {
-                text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m`;
+                text = `列车类型: ${trainType} \n表\0\0\0\0号: ${this.device.model.serviceNumber}\n车\0次\0号: ${this.device.model.tripNumber}\n目的地号: ${this.device.model.destinationCode ? this.device.model.destinationCode : ''}\n车\0组\0号: ${this.device.model.groupNumber}\n早\0晚\0点: ${destinationText}\n运行方向: ${direction ? '上行' : '下行'}\n乘务组号: \n起点站名: \n终点站名: \n占用轨道: ${this.device.model.sectionModel ? (this.device.model.sectionModel.parentName ? this.device.model.sectionModel.parentName : this.device.model.sectionModel.name) : ''}\n所在车站: \n车地通信: 正常\n运行等级: 4\n扣车状态: ${this.device.model.hold ? '扣车' : '正常'}\n跳停状态: ${this.device.model.jump ? '跳停' : '正常'} \n停稳状态: ${!this.device.model.stop ? '未停稳' : '停稳'}\n阻塞状态: 无\n列车速度: ${this.device.model.speed || 0} km/h\n列车移动授权距离: ${this.device.model.maLen || 0} m${this.device.model.num ? '\n车内人数: ' + this.device.model.num : ''}`;
             }
         }
         const trainTip = this.device.style.Train.common.trainTip;

src/jmapNew/shape/Train/TrainBody.js

@@ -289,7 +289,8 @@ export default class TrainBody extends Group {
         this.deviceModel.down = false;
     }
     setTrainColor(color) {
-        this.trainBodyBox && this.trainBodyBox.setStyle('fill', color);
+        this.trainBodyBox && this.trainBodyBox.setColor('fill', color);
+        // Style('fill', color);
     }
     setHShow(isShow) {
         if (this.textH) {

src/jmapNew/shape/Train/index.js

@@ -84,6 +84,7 @@ export default class Train extends Group {
                 hold:model.hold,
                 jump:model.jump,
                 stop:model.stop,
+                num:model.num,
                 dt: model.dt,
                 driveMode: model.driveMode,
                 model: model
@@ -335,24 +336,36 @@ export default class Train extends Group {
         const flag = model.trainWindowModel ? model.trainWindowModel.reversal : false;
         if (model) {
             this.recover();
+            // if (this.style.Train.common.trainHeadColorChangeMode) {
+            //     this.setDriveMode(model.driveMode + model.runLevel);
+            // } else {
+            //     this.setDriveMode(model.driveMode);
+            // }
+            this.setRunStatus(model.stop, flag);
+            const path = window.location.href;
+            if (!path.includes('/practiceDisplay')) {
                 if (this.style.Train.common.trainHeadColorChangeMode) {
                     this.setDriveMode(model.driveMode + model.runLevel);
                 } else {
                     this.setDriveMode(model.driveMode);
                 }
-            this.setRunStatus(model.stop, flag);
                 this.setCommunicationStatus(model.runLevel);
+                this.setSoonerOrLater(model.dt);
+            }
             this.setDoorStatus(model.doorCloseLock);
             this.setAlarmStatus(model.alarmStatus);
             this.setHoldStatus(model.hold);
             this.setJumpStatus(model.jump);
-            this.setSoonerOrLater(model.dt);
+            // this.setSoonerOrLater(model.dt);
             this.setTrainTypeColor(model.type);
             this.setPlanRoutingTypeColor(model.planRoutingType);
             const style = this.style;
             if (style.Section.trainPosition.display) {
                 this.updateSection(object);
             }
+            if (path.includes('/practiceDisplay')) {
+                this.handlePassagerColor(model.num);
+            }
         }
     }
     setTrainTypeColor(type) {
@@ -365,6 +378,31 @@ export default class Train extends Group {
         this.trainB && this.trainB.removeTrainDetail();
     }
 
+    handlePassagerColor(num) {
+        if (num) {
+            // && num > 0
+            const passagerNum = parseInt(num);
+            if (passagerNum < 100) {
+                this.trainB && this.trainB.setTrainColor('#29a909');
+                this.trainL && this.trainL.setColor('#29a909');
+                this.trainR && this.trainR.setColor('#29a909');
+            } else if (passagerNum < 200 && passagerNum >= 100) {
+                this.trainB && this.trainB.setTrainColor('#ffa500');
+                this.trainL && this.trainL.setColor('#ffa500');
+                this.trainR && this.trainR.setColor('#ffa500');
+            } else {
+                this.trainB && this.trainB.setTrainColor('#F00');
+                this.trainL && this.trainL.setColor('#F00');
+                this.trainR && this.trainR.setColor('#F00');
+            }
+        } else {
+            this.trainB && this.trainB.setTrainColor('#29a909');
+            this.trainL && this.trainL.setColor('#29a909');
+            this.trainR && this.trainR.setColor('#29a909');
+        }
+
+    }
+
     getBoundingRect() {
         const list = [this.trainB, this.trainL, this.trainR];
         let rect = null;

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

@@ -407,8 +407,9 @@ export default {
                             [`集中站 ${this.model.stationName} 区段 ${this.model.sectionName}报告恢复计轴有效`]);
                     }
                 }).catch((error) => {
+                    console.error(error);
                     this.loading = false;
-                    this.$refs.noticeInfo.doShow(operate, error.message);
+                    this.$refs.noticeInfo.doShow();
                 });
             } else {
                 if (this.model.stationName != this.model.confirmStationName) {

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmControl.vue

@@ -121,7 +121,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue

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

src/jmapNew/theme/beijing_01/menus/dialog/childDialog/passwordInputBox.vue

@@ -178,7 +178,7 @@ export default {
                 }
             }).catch(() => {
                 this.loading = false;
-                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow();
             });
         }
     }

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

@@ -196,7 +196,8 @@ export default {
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow({}, error.message);
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
                 });
             } else {
                 this.doClose();

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/jmapNew/theme/beijing_01/menus/menuButton.vue

@@ -356,7 +356,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         selectedChange() {
@@ -384,7 +384,7 @@ export default {
                                 this.$refs.password.doShow(operate);
                             }
                         }).catch(() => {
-                            this.$refs.noticeInfo.doShow(operate);
+                            this.$refs.noticeInfo.doShow();
                         });
 
                     }
@@ -407,7 +407,7 @@ export default {
                                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             }
                         }).catch(() => {
-                            this.$refs.noticeInfo.doShow(operate);
+                            this.$refs.noticeInfo.doShow();
                         });
                     }
                     break;
@@ -429,7 +429,7 @@ export default {
                                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                             }
                         }).catch(() => {
-                            this.$refs.noticeInfo.doShow(operate);
+                            this.$refs.noticeInfo.doShow();
                         });
                     }
                     break;

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

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

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

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

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

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

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

@@ -135,13 +135,11 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

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

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

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

@@ -135,13 +135,10 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
                     });
                 } else {
                     return false;

src/jmapNew/theme/beijing_01/menus/menuSection.vue

@@ -180,7 +180,7 @@ export default {
                 if (selectType.fault) {
                     this.faultUnlock(selectType);
                 } else {
-                    this.$refs.noticeInfo.doShow({}, `该区段[${selectType.name}(${selectType.code})]没有故障`);
+                    this.$refs.noticeInfo.doShow(`该区段[${selectType.name}(${selectType.code})]没有故障`);
                 }
                 break;
             }

src/jmapNew/theme/beijing_01/menus/menuSignal.vue

@@ -207,7 +207,7 @@ export default {
                     if (route) {
                         this.setRoute(route);
                     } else {
-                        this.$refs.noticeInfo.doShow({}, `没有以[${this.oldSelected.name}(${this.oldSelected.code})]为始端信号机，以[${selectType.name}(${selectType.code})] 为终端信号机的进路`);
+                        this.$refs.noticeInfo.doShow(`没有以[${this.oldSelected.name}(${this.oldSelected.code})]为始端信号机，以[${selectType.name}(${selectType.code})] 为终端信号机的进路`);
                     }
                     this.clickNum = 0;
                 } else {
@@ -244,7 +244,7 @@ export default {
             case OperationEvent.Signal.reopenSignal.button.operation: {
                 // 信号重开
                 if (selectType.greenOpen) {
-                    this.$refs.noticeInfo.doShow({}, `信号机[${selectType.name}(${selectType.code})]已开启，无需重开信号机`);
+                    this.$refs.noticeInfo.doShow(`信号机[${selectType.name}(${selectType.code})]已开启，无需重开信号机`);
                 } else {
                     // 开放进路信号机因故关闭
                     this.reopenSignalByRoute(selectType);
@@ -266,7 +266,7 @@ export default {
                     }
 
                 } else {
-                    this.$refs.noticeInfo.doShow({}, `信号机[${selectType.name}(${selectType.code})]没有已锁闭进路，不能设置联锁自动进路`);
+                    this.$refs.noticeInfo.doShow(`信号机[${selectType.name}(${selectType.code})]没有已锁闭进路，不能设置联锁自动进路`);
                 }
                 break;
             }
@@ -313,7 +313,8 @@ export default {
         setRoute(route) {
             commitOperate(menuOperate.Signal.arrangementRoute, {routeCode:route.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 取消进路
@@ -328,7 +329,8 @@ export default {
         cancelTrainRouteByLow(selectType) {
             commitOperate(menuOperate.Signal.cancelTrainRoute, {signalCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 现地总人解
@@ -344,7 +346,8 @@ export default {
         reopenSignalByRoute(selectType) {
             commitOperate(menuOperate.Signal.reopenSignal, {signalCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号重开
@@ -367,7 +370,8 @@ export default {
         signalCloseByLow(selectType) {
             commitOperate(menuOperate.Signal.signalClose, {signalCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交人工控
@@ -390,14 +394,16 @@ export default {
         singalPassModel(selectType) {
             commitOperate(menuOperate.Signal.setAutoInterlock, {signalCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 取消通过模式
         singalCancelPassModel(selectType) {
             commitOperate(menuOperate.Signal.cancelAutoInterlock, {signalCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 查询进路状态

src/jmapNew/theme/beijing_01/menus/menuStation.vue

@@ -198,7 +198,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 全站取消联锁自动触发
@@ -214,7 +214,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 上电解锁

src/jmapNew/theme/beijing_01/menus/menuStationStand.vue

@@ -223,14 +223,16 @@ export default {
         setDetainTrainByLow(selectType) {
             commitOperate(menuOperate.StationStand.setDetainTrain, {standCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         /** 取消扣车 */
         cancleDetainTrainByLow(selectType) {
             commitOperate(menuOperate.StationStand.cancelDetainTrain, {standCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置扣车

src/jmapNew/theme/beijing_01/menus/menuSwitch.vue

@@ -226,7 +226,8 @@ export default {
         lock(selectType) {
             commitOperate(menuOperate.Switch.lock, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 道岔解锁
@@ -236,7 +237,8 @@ export default {
                     this.$refs.switchControl.doShow(operate, selectType);
                 }
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 现地道岔强扳
@@ -247,21 +249,24 @@ export default {
                 }
 
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 单操到定位
         locate(selectType) {
             commitOperate(menuOperate.Switch.locate, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 单操到反位
         reverse(selectType) {
             commitOperate(menuOperate.Switch.reverse, {switchCode:selectType.code}, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 区段切除

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

@@ -330,10 +330,6 @@ export default {
             });
         },
         nextStation() {
-            // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Drive_Ahead',
@@ -342,14 +338,11 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         routeBlockRun() {
-            // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Route_Block_Drive',
@@ -358,7 +351,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverFuideSignal() {
@@ -370,7 +364,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverEedLight() {
@@ -382,7 +377,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 限速行驶
@@ -397,10 +393,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         undeveloped() {

src/jmapNew/theme/chengdu_01/menus/dialog/createDeviceLabel.vue

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

src/jmapNew/theme/chengdu_01/menus/dialog/platformDwell.vue

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

src/jmapNew/theme/chengdu_01/menus/dialog/speedLimitControl.vue

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

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

@@ -129,7 +129,7 @@ export default {
                     }
                 }, 1000).catch(() => {
                     this.loading = true;
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 });
             }
         }

src/jmapNew/theme/chengdu_01/menus/menuRequest.vue

@@ -123,7 +123,6 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 // this.doClose();
-                // this.$refs.noticeInfo.doShow(operate);
             });
         }
     }

src/jmapNew/theme/chengdu_01/menus/menuSection.vue

@@ -186,10 +186,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(step);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置故障

src/jmapNew/theme/chengdu_01/menus/menuSignal.vue

@@ -258,7 +258,7 @@ export default {
                     this.$refs.routeControl.doShow(step, this.selected);
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置故障
@@ -311,7 +311,7 @@ export default {
                     });
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         checkRoutes(routes) {
@@ -377,7 +377,7 @@ export default {
                     this.$store.dispatch('menuOperation/pushRequestList', { device: this.selected, operation: { code: OperationEvent.Signal.lock.menu.operation, name: '终端信号机封锁', cmdType:CMD.Signal.CMD_SIGNAL_BLOCK}});
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号解封

src/jmapNew/theme/chengdu_01/menus/menuStationPlatform.vue

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

src/jmapNew/theme/chengdu_01/menus/menuStationStand.vue

@@ -217,7 +217,7 @@ export default {
 
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         triggerFaultManagement() {

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

@@ -240,10 +240,6 @@ export default {
             });
         },
         nextStation() {
-            // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Drive_Ahead',
@@ -252,14 +248,11 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         routeBlockRun() {
-            // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Route_Block_Drive',
@@ -268,7 +261,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverFuideSignal() {
@@ -280,7 +274,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverEedLight() {
@@ -292,7 +287,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 限速行驶
@@ -308,10 +304,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设计划车
@@ -327,7 +323,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -344,7 +340,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -361,7 +357,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -378,7 +374,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmControl.vue

@@ -117,7 +117,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/confirmTrain.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/childDialog/passwordInputBox.vue

@@ -183,7 +183,7 @@ export default {
                 }
             }).catch(() => {
                 this.loading = false;
-                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow();
             });
         }
     }

src/jmapNew/theme/chengdu_03/menus/dialog/routeDetail.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/routeGuide.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/routeHandControl.vue

@@ -238,7 +238,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交自动控
@@ -250,7 +251,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/chengdu_03/menus/dialog/routeSelection.vue

@@ -271,7 +271,8 @@ export default {
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(error.message);
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
                 });
             }
         },
@@ -285,7 +286,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/chengdu_03/menus/dialog/standControl.vue

@@ -567,7 +567,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/chengdu_03/menus/dialog/trainControl.vue

@@ -257,7 +257,7 @@ export default {
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;
@@ -281,7 +281,7 @@ export default {
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;
@@ -305,7 +305,7 @@ export default {
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        this.$refs.noticeInfo.doShow(operate);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

src/jmapNew/theme/chengdu_03/menus/dialog/trainCreate.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainCreateNumber.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainDelete.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainMove.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainMoveNumber.vue

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

src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue

@@ -179,7 +179,8 @@ export default {
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

src/jmapNew/theme/chengdu_03/menus/menuButton.vue

@@ -238,7 +238,8 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         resetPosition() {
@@ -356,11 +357,12 @@ export default {
                 });
                 if (!flag) {
                     this.deviceList = [];
-                    this.$refs.noticeInfo.doShow(operate, '未找到选择进路！');
+                    this.$refs.noticeInfo.doShow('未找到选择进路！');
                 }
             }
         },
         handelFunctionButton(model, subType) {
+            debugger;
             const operate = {
                 over: true,
                 operation: this.$store.state.menuOperation.buttonOperation,
@@ -391,14 +393,15 @@ export default {
                     operate.param = {stationCodes: [model.code]};
                     break;
                 case 'emergency':
-                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_FORCE_STATION_CONTROL;
+                    operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
                     operate.param = {stationCodes: [model.code]};
                     break;
                 }
             }
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
                 this.deviceList = [];
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handelTotalCancel(model, subType) {
@@ -435,7 +438,8 @@ export default {
             }
             this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
                 this.deviceList = [];
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleGuideRoute(deviceList) {
@@ -458,7 +462,8 @@ export default {
                             this.$refs.password.doShow(operate);
                         }
                     }).catch((error) => {
-                        this.$refs.noticeInfo.doShow(operate, error.message);
+                        console.error(error);
+                        this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     const operate = {
@@ -476,7 +481,8 @@ export default {
                             this.$refs.password.doShow(operate);
                         }
                     }).catch((error) => {
-                        this.$refs.noticeInfo.doShow(operate, error.message);
+                        console.error(error);
+                        this.$refs.noticeInfo.doShow();
                     });
                 }
             } else if (deviceList.length === 2) {
@@ -494,13 +500,14 @@ export default {
                         this.deviceList = [];
                         flag = true;
                         this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {}).catch((error) => {
-                            this.$refs.noticeInfo.doShow(operate, error.message);
+                            this.$refs.noticeInfo.doShow();
+                            console.error(error);
                         });
                     }
                 });
                 if (!flag) {
                     this.deviceList = [];
-                    this.$refs.noticeInfo.doShow(operate, '未找到选择进路！');
+                    this.$refs.noticeInfo.doShow('未找到选择进路！');
                 }
             }
         },
@@ -519,7 +526,8 @@ export default {
                 operate.param = {signalCode: model.code};
                 this.deviceList = [];
                 this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                    this.$refs.noticeInfo.doShow(operate, error.message);
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
                 });
             }
         },
@@ -540,7 +548,8 @@ export default {
             operate.param = {signalCode: model.code, routeCodeList: routeCodeList};
             this.deviceList = [];
             this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handelSwitchOperate(model) {
@@ -552,7 +561,8 @@ export default {
                 param: { switchCode: model.code}
             };
             this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handelBlockOrUnblock(model) {
@@ -578,7 +588,8 @@ export default {
                 operate.param = {signalCode: model.code};
             }
             this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handelGuideLock(model) {
@@ -595,7 +606,8 @@ export default {
                 operate.cmdType = CMD.Station.CMD_STATION_SET_MASTER_GUIDE_LOCK;
             }
             this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handelFaultSection(model) {
@@ -607,7 +619,8 @@ export default {
                 param: {sectionCode: model.code}
             };
             this.$store.dispatch('training/nextNew', operate).then(({valid, response}) => {}).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         selectedChange() {

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

@@ -129,7 +129,7 @@ export default {
                     }
                 }, 1000).catch(() => {
                     this.loading = true;
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 });
             }
         }

src/jmapNew/theme/chengdu_03/menus/menuDialog/limitSpeed.vue

@@ -1,6 +1,15 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
         <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
@@ -13,10 +22,10 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
+export default {
     name: 'TrainAdd',
     components: {
     },
@@ -37,8 +46,8 @@
             },
             operation: null,
             dialogShow: false,
-                loading: false,
-            }
+            loading: false
+        };
     },
     computed: {
         ...mapGetters('map', [
@@ -54,13 +63,13 @@
             return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
         },
         title() {
-                return '设置限速'
+            return '设置限速';
         }
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-            })
+        });
     },
     methods: {
         doShow(operate) {
@@ -84,35 +93,34 @@
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                        let operate = {
+                    const operate = {
                         send: true,
 
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
 
                     this.loading = true;
                     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
+                    });
                 } else {
                     return false;
                 }
             });
         },
         cancel() {
-                let operate = {
+            const operate = {
 
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -121,7 +129,7 @@
             }).catch(error => { this.doClose(); });
         }
     }
-    }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {

src/jmapNew/theme/chengdu_03/menus/menuDialog/passwordBox.vue

@@ -163,7 +163,7 @@ export default {
                     });
                 });
             } else {
-                this.$refs.noticeInfo.doShow(operate, ['密码输入错误！']);
+                this.$refs.noticeInfo.doShow('密码输入错误！');
             }
         },
         click(key) {

src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue

@@ -232,13 +232,12 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

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

@@ -1,25 +1,37 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
       <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
         <span class="base-label">添加位置</span>
         <div style="position: relative; top:-10px;">
           <el-form-item prop="stationStandCode">
             <span slot="label">终&emsp;&emsp;&emsp;端:</span>
             <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="前车车次号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
+            <el-input v-model="addModel.trainNumberLimber" />
           </el-form-item>
         </div>
       </div>
       <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
+        <el-input v-model="addModel.groupNumber" />
       </el-form-item>
     </el-form>
     <el-row justify="center" class="button-group">
@@ -34,10 +46,10 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
+export default {
     name: 'TrainAdd',
     components: {
     },
@@ -47,7 +59,7 @@
             addModel: {
                 groupNumber: '',
                 stationStandCode: '',
-                    trainNumberLimber: '',
+                trainNumberLimber: ''
             },
 
             rules: {
@@ -59,12 +71,12 @@
                 // ],
                 stationStandCode: [
                     { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
+                ]
             },
             operation: null,
             dialogShow: false,
-                loading: false,
-            }
+            loading: false
+        };
     },
     computed: {
         ...mapGetters('map', [
@@ -80,20 +92,20 @@
             return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
         },
         title() {
-                return '添加计划车'
+            return '添加计划车';
         }
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-            })
+        });
     },
     methods: {
         doShow(operate) {
             this.operate = operate || {};
             this.operation = operate.operation;
 
-                //非断电激活时设置初始值
+            // 非断电激活时设置初始值
             if (!this.dialogShow) {
                 this.loading = false;
             }
@@ -111,35 +123,34 @@
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                        let operate = {
+                    const operate = {
                         send: true,
 
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
 
                     this.loading = true;
                     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
+                    });
                 } else {
                     return false;
                 }
             });
         },
         cancel() {
-                let operate = {
+            const operate = {
 
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -148,7 +159,7 @@
             }).catch(error => { this.doClose(); });
         }
     }
-    }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {

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

@@ -1,16 +1,24 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
       <el-form-item prop="stationStandCode">
         <span slot="label">终&emsp;&emsp;端:</span>
         <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                    <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code">
-                    </el-option>
+          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
         </el-select>
       </el-form-item>
       <el-form-item label="车 次 号:" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
+        <el-input v-model="addModel.groupNumber" />
       </el-form-item>
     </el-form>
     <el-row justify="center" class="button-group">
@@ -25,10 +33,10 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
+export default {
     name: 'TrainAdd',
     components: {
     },
@@ -37,7 +45,7 @@
             trainNoList: [],
             addModel: {
                 groupNumber: '',
-                    stationStandCode: '',
+                stationStandCode: ''
             },
 
             rules: {
@@ -46,12 +54,12 @@
                 ],
                 stationStandCode: [
                     { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
+                ]
             },
             operation: null,
             dialogShow: false,
-                loading: false,
-            }
+            loading: false
+        };
     },
     computed: {
         ...mapGetters('map', [
@@ -67,20 +75,20 @@
             return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
         },
         title() {
-                return '删除计划车'
+            return '删除计划车';
         }
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-            })
+        });
     },
     methods: {
         doShow(operate) {
             this.operate = operate || {};
             this.operation = operate.operation;
 
-                //非断电激活时设置初始值
+            // 非断电激活时设置初始值
             if (!this.dialogShow) {
                 this.loading = false;
             }
@@ -98,35 +106,34 @@
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                        let operate = {
+                    const operate = {
                         send: true,
 
-                            operation: OperationEvent.Command.planTrain.delPlanTrain.operation,
-                        }
+                        operation: OperationEvent.Command.planTrain.delPlanTrain.operation
+                    };
 
                     this.loading = true;
                     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
+                    });
                 } else {
                     return false;
                 }
             });
         },
         cancel() {
-                let operate = {
+            const operate = {
 
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -135,7 +142,7 @@
             }).catch(error => { this.doClose(); });
         }
     }
-    }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {

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

@@ -1,9 +1,18 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
       <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
+        <el-input v-model="addModel.groupNumber" />
       </el-form-item>
       <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
         <span class="base-label">目的</span>
@@ -11,13 +20,16 @@
           <el-form-item prop="stationStandCode">
             <span slot="label">终&emsp;&emsp;端:</span>
             <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="车 次 号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
+            <el-input v-model="addModel.trainNumberLimber" />
           </el-form-item>
         </div>
       </div>
@@ -34,10 +46,10 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
+export default {
     name: 'TrainTranstalet',
     components: {
     },
@@ -47,7 +59,7 @@
             addModel: {
                 groupNumber: '',
                 stationStandCode: '',
-                    trainNumberLimber: '',
+                trainNumberLimber: ''
             },
 
             rules: {
@@ -59,12 +71,12 @@
                 ],
                 stationStandCode: [
                     { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
+                ]
             },
             operation: null,
             dialogShow: false,
-                loading: false,
-            }
+            loading: false
+        };
     },
     computed: {
         ...mapGetters('map', [
@@ -80,20 +92,20 @@
             return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
         },
         title() {
-                return '平移计划车'
+            return '平移计划车';
         }
     },
     mounted() {
         this.$nextTick(() => {
             this.$store.dispatch('training/tipReload');
-            })
+        });
     },
     methods: {
         doShow(operate) {
             this.operate = operate || {};
             this.operation = operate.operation;
 
-                //非断电激活时设置初始值
+            // 非断电激活时设置初始值
             if (!this.dialogShow) {
                 this.loading = false;
             }
@@ -111,35 +123,34 @@
         commit() {
             this.$refs['form'].validate((valid) => {
                 if (valid) {
-                        let operate = {
+                    const operate = {
                         send: true,
 
-                            operation: OperationEvent.Command.planTrain.translatPlanTrain.operation,
-                        }
+                        operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
+                    };
 
                     this.loading = true;
                     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(error => {
                         this.loading = false;
                         this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
+                        console.error(error);
+                        // this.$refs.noticeInfo.doShow();
+                    });
                 } else {
                     return false;
                 }
             });
         },
         cancel() {
-                let operate = {
+            const operate = {
 
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
@@ -148,5 +159,5 @@
             }).catch(error => { this.doClose(); });
         }
     }
-    }
+};
 </script>

src/jmapNew/theme/chengdu_03/menus/menuSection.vue

@@ -173,10 +173,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(step);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 故障解锁

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

@@ -219,10 +219,6 @@ export default {
             });
         },
         nextStation() {
-            // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Drive_Ahead',
@@ -231,14 +227,11 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         routeBlockRun() {
-            // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Route_Block_Drive',
@@ -247,7 +240,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverFuideSignal() {
@@ -259,7 +253,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverEedLight() {
@@ -271,7 +266,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 限速行驶
@@ -287,10 +283,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设计划车
@@ -306,7 +302,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -323,7 +319,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -340,7 +336,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },
@@ -357,7 +353,7 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDetailInfo.doShow(operate, this.selected);
                 } else {
-                    this.$refs.noticeInfo.doShow(operate);
+                    this.$refs.noticeInfo.doShow();
                 }
             });
         },

src/jmapNew/theme/components/menus/childDialog/passwordInputBox.vue

@@ -184,7 +184,7 @@ export default {
                 }
             }).catch(() => {
                 this.loading = false;
-                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo && this.$refs.noticeInfo.doShow();
             });
         }
     }

src/jmapNew/theme/components/menus/dialog/routeControl.vue

@@ -319,7 +319,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         sendCommandNext(operate) {
@@ -336,7 +337,8 @@ export default {
                 }).catch((error) => {
                     that.loading = false;
                     that.doClose();
-                    that.$refs.noticeInfo.doShow(error.message);
+                    console.error(error);
+                    that.$refs.noticeInfo.doShow();
                 });
             });
         },

src/jmapNew/theme/components/menus/dialog/routeDetail.vue

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

src/jmapNew/theme/components/menus/dialog/routeHandControl.vue

@@ -319,7 +319,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交自动控
@@ -334,7 +335,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/components/menus/dialog/standJumpStopControl.vue

@@ -273,7 +273,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
 
@@ -288,7 +289,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/components/menus/dialog/standStopTime.vue

@@ -218,7 +218,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow({}, error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/components/menus/dialog/switchControl.vue

@@ -294,7 +294,7 @@ export default {
                 }
             }).catch(() => {
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
 
@@ -318,7 +318,8 @@ export default {
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
 

src/jmapNew/theme/components/menus/dialog/switchHookLock.vue

@@ -136,7 +136,8 @@ export default {
                 }).catch((error) => {
                     this.loading = false;
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(error.message);
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
                 });
             } else {
                 const group = this.$route.query.group;
@@ -152,7 +153,8 @@ export default {
                 commitTrainSend(group, param).then(({valid, operate})=>{
                     this.doClose();
                 }).catch((error) => {
-                    this.$refs.noticeInfo.doShow(error.message);
+                    console.error(error);
+                    this.$refs.noticeInfo.doShow();
                     this.doClose();
                 });
             }

src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmControl.vue

@@ -170,7 +170,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号关灯
@@ -190,7 +190,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号重开
@@ -210,7 +210,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 取消进路
@@ -230,7 +230,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交人工控
@@ -250,7 +250,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交ATS自动控
@@ -270,7 +270,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置运行等级
@@ -291,7 +291,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 停站时间
@@ -312,7 +312,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置折返策略
@@ -333,7 +333,7 @@ export default {
             }).catch(() => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/routeDetail.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/routeLock.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/standDetainTrainAll.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue

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

src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue

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

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

@@ -131,7 +131,8 @@ export default {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         }
     }

src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue

@@ -161,7 +161,7 @@ export default {
                     });
                 });
             } else {
-                this.$refs.noticeInfo.doShow(operate, [this.$t('menu.menuDialog.IncorrectPassword')]);
+                this.$refs.noticeInfo.doShow(this.$t('menu.menuDialog.IncorrectPassword'));
 
             }
         },

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

@@ -135,13 +135,11 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        // this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

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

@@ -117,13 +117,11 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        // this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

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

@@ -134,13 +134,11 @@ export default {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
-                        } else {
-                            // this.$refs.noticeInfo.doShow(operate);
                         }
                     }).catch(() => {
                         this.loading = false;
                         this.doClose();
-                        // this.$refs.noticeInfo.doShow(operate);
+                        // this.$refs.noticeInfo.doShow();
                     });
                 } else {
                     return false;

src/jmapNew/theme/fuzhou_01/menus/menuStation.vue

@@ -181,14 +181,16 @@ export default {
         setAutoTrigger() {
             commitOperate(menuOperate.Station.setAutoTrigger, { stationCode: this.selected.code }, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 全站取消联锁自动触发
         cancelAutoTrigger() {
             commitOperate(menuOperate.Station.cancelAutoTrigger, { stationCode: this.selected.code }, 3).then(({valid, operate})=>{
             }).catch(error=>{
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 上电解锁

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

@@ -209,10 +209,6 @@ export default {
             });
         },
         nextStation() {
-            // commitOperate(menuOperate.Train.nextStation, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Drive_Ahead',
@@ -221,14 +217,11 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         routeBlockRun() {
-            // commitOperate(menuOperate.Train.routeBlockRun, { groupNumber: this.selected.code }, 3).then(({valid, operate})=>{
-            // }).catch((error) => {
-            //     this.$refs.noticeInfo.doShow(error.message);
-            // });
             const group = this.$route.query.group;
             const param = {
                 commandType: 'Route_Block_Drive',
@@ -237,7 +230,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverFuideSignal() {
@@ -249,7 +243,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         handleOverEedLight() {
@@ -261,7 +256,8 @@ export default {
             };
             commitTrainSend(group, param).then(({valid, operate})=>{
             }).catch((error) => {
-                this.$refs.noticeInfo.doShow(error.message);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 限速行驶
@@ -279,10 +275,10 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
-                    this.$refs.noticeInfo.doShow(step);
+                    this.$refs.noticeInfo.doShow();
                 }
             }).catch(() => {
-                this.$refs.noticeInfo.doShow(step);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 添加列车识别号

src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmControl.vue

@@ -170,7 +170,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号关灯
@@ -190,7 +191,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 信号重开
@@ -210,7 +212,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 取消进路
@@ -230,7 +233,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交人工控
@@ -250,7 +254,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 进路交ATS自动控
@@ -270,7 +275,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置运行等级
@@ -291,7 +297,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 停站时间
@@ -312,7 +319,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         // 设置折返策略
@@ -333,7 +341,8 @@ export default {
             }).catch(error => {
                 this.loading = false;
                 this.doClose();
-                this.$refs.noticeInfo.doShow(operate, [error.message]);
+                console.error(error);
+                this.$refs.noticeInfo.doShow();
             });
         },
         cancel() {

src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue

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