From 0489cf2fd3941f24c290ceefd16f5063567f516b Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 11:18:41 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/map/{skinCode}/train?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/map.js                           |    8 -
 .../batong_01/menus/dialog/trainControl.vue   |  708 ++++++-----
 .../batong_01/menus/dialog/trainCreate.vue    |  275 ++---
 .../beijing_01/menus/dialog/trainCreate.vue   |  276 ++---
 .../chengdu_03/menus/dialog/trainControl.vue  |  444 ++++---
 .../chengdu_03/menus/dialog/trainCreate.vue   |  212 ++--
 .../menus/dialog/trainCreateNumber.vue        |  304 ++---
 .../menus/dialog/trainDeleteNumber.vue        |  296 ++---
 .../menus/dialog/trainDetailInfo.vue          |    1 -
 .../menus/dialog/trainEditNumber.vue          |  220 ++--
 .../menus/dialog/trainMoveNumber.vue          |  332 ++---
 .../fuzhou_01/menus/dialog/trainControl.vue   |  737 ++++++------
 .../fuzhou_01/menus/dialog/trainCreate.vue    |  213 ++--
 .../fuzhou_01/menus/dialog/trainSwitch.vue    |  218 ++--
 src/store/modules/map.js                      | 1064 ++++++++---------
 src/utils/loaddata.js                         |  108 +-
 src/views/lesson/trainingrecord/index.vue     |  128 +-
 .../lesson/trainingrecord/manage/index.vue    |  176 +--
 18 files changed, 2845 insertions(+), 2875 deletions(-)

diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index d119c6220..470baf5f1 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -49,14 +49,6 @@ export function getPublishMapDetailById(id) {
     });
 }
 
-/** 获取发布地图列车列表*/
-export function getPublishTrainList(skinCode) {
-    return request({
-        url: `/api/map/${skinCode}/train`,
-        method: 'get'
-    });
-}
-
 /** 获取发布地图列表*/
 export function listPublishMap(params) {
     return request({
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
index 14842059e..4337f3708 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainControl.vue
@@ -82,383 +82,375 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
-	name: 'TrainControl',
-	components: {
-		ConfirmTrain,
-		NoticeInfo
-	},
-	data() {
-		return {
-			trainList: [],
-			formModel: {
-				trainNo: '',
-				trainNumber: '',
-				trainType: '01',
-				serverNo: '',
-				targetCode: ''
-			},
+    name: 'TrainControl',
+    components: {
+        ConfirmTrain,
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainList: [],
+            formModel: {
+                trainNo: '',
+                trainNumber: '',
+                trainType: '01',
+                serverNo: '',
+                targetCode: ''
+            },
 
-			rules: {
-				trainNumber: [
-					{ required: true, message: '请选择车组号', trigger: 'change' }
-				],
-				trainType: [
-					{ required: true, message: '请选择一个列车类型', trigger: 'change' }
-				],
-				serverNo: [
-					{ required: true, message: '请输入表号', trigger: 'blur' }
-				],
-				trainNo: [
-					{ required: true, message: '请输入车次号', trigger: 'blur' }
-				],
-				targetCode: [
-					{ required: true, message: '请输入目的地号', trigger: 'blur' }
-				]
-			},
-			operation: null,
-			dialogShow: false,
-			loading: false,
-			direction: 0
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		trainNoIsDisabled() {
-			return false;
-		},
-		serverNoIsDisabled() {
-			return false;
-		},
-		targetCodeIsDisabled() {
-			return false;
-		},
-		trainNumberIsDisabled() {
-			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-				return true;
-			}
-			return false;
-		},
-		trainTypeIsDisabled() {
-			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-				return true;
-			}
-			return false;
-		},
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdTrainNumber() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainNumberChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainNumberChange.domId;
-				}
-			}
-			return null;
-		},
-		domIdTrainNo() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainNoChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainNoChange.domId;
-				}
-			}
-			return null;
-		},
-		domIdTrainType() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainTypeChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainTypeChange.domId;
-				}
-			}
-			return null;
-		},
-		domIdServerNo() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.serverNoChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.serverNoChange.domId;
-				}
-			}
-			return null;
-		},
-		domIdTargetCode() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.targetCodeChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.targetCodeChange.domId;
-				}
-			}
-			return null;
-		},
-		domIdConfirm() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.menu.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.menu.domId;
-				}
-			}
-			return null;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				return '添加列车识别号';
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				return '修改列车识别号';
-			}
-			return '';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (map) {
-				getPublishTrainList(map.skinCode).then(resp => {
-					this.trainList = resp.data;
-				}).catch(() => {
-					this.$messageBox(`获取列车车组号失败`);
-				});
-			}
-		},
-		doShow(operate, selected) {
-			// 如果不是断点激活，则需要对初始值进行初始化
-			if (!this.dialogShow) {
-				this.operation = operate.operation;
-			}
+            rules: {
+                trainNumber: [
+                    { required: true, message: '请选择车组号', trigger: 'change' }
+                ],
+                trainType: [
+                    { required: true, message: '请选择一个列车类型', trigger: 'change' }
+                ],
+                serverNo: [
+                    { required: true, message: '请输入表号', trigger: 'blur' }
+                ],
+                trainNo: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                targetCode: [
+                    { required: true, message: '请输入目的地号', trigger: 'blur' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            direction: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        trainNoIsDisabled() {
+            return false;
+        },
+        serverNoIsDisabled() {
+            return false;
+        },
+        targetCodeIsDisabled() {
+            return false;
+        },
+        trainNumberIsDisabled() {
+            if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+                return true;
+            }
+            return false;
+        },
+        trainTypeIsDisabled() {
+            if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+                return true;
+            }
+            return false;
+        },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdTrainNumber() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNumberChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNumberChange.domId;
+                }
+            }
+            return null;
+        },
+        domIdTrainNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNoChange.domId;
+                }
+            }
+            return null;
+        },
+        domIdTrainType() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainTypeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainTypeChange.domId;
+                }
+            }
+            return null;
+        },
+        domIdServerNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.serverNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.serverNoChange.domId;
+                }
+            }
+            return null;
+        },
+        domIdTargetCode() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.targetCodeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.targetCodeChange.domId;
+                }
+            }
+            return null;
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.menu.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.menu.domId;
+                }
+            }
+            return null;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                return '添加列车识别号';
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                return '修改列车识别号';
+            }
+            return '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+            }
 
-			this.formModel = {
-				trainNumber: selected.trainNumber,
-				trainNo: selected.trainNo,
-				trainType: '01',
-				serverNo: selected.serverNo,
-				targetCode: selected.targetCode
-			};
+            this.formModel = {
+                trainNumber: selected.trainNumber,
+                trainNo: selected.trainNo,
+                trainType: '01',
+                serverNo: selected.serverNo,
+                targetCode: selected.targetCode
+            };
 
-			/** 加载列车数据*/
-			this.loadInitData(this.map);
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.$store.dispatch('map/setTrainWindowShow', false);
-		},
-		trainNumberChange(trainNumber) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${trainNumber}`,
-				operation: ''
-			};
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        trainNumberChange(trainNumber) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${trainNumber}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainTypeChange(trainType) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${trainType}`,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainTypeChange(trainType) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${trainType}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		serverNoChange(serverNo) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${serverNo}`,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        serverNoChange(serverNo) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${serverNo}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.serverNoChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.serverNoChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainNoChange(trainNo) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${trainNo}`,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainNoChange(trainNo) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${trainNo}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		targetCodeChange(targetCode) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${targetCode}`,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        targetCodeChange(targetCode) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${targetCode}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.targetCodeChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.targetCodeChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		commit() {
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				/** 增加列车识别号*/
-				this.addTrainId();
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				/** 修改列车识别号*/
-				this.editTrainId();
-			}
-		},
-		// 增加列车识别号
-		addTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const model = this.formModel;
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.addTrainId.menu.operation,
-						messages: [`添加列车识别号：成功`],
-						val: `${model.trainNumber}::${model.trainType}::${model.serverNo}::${model.trainNo}::${model.targetCode}`
-					};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        commit() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                /** 增加列车识别号*/
+                this.addTrainId();
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                /** 修改列车识别号*/
+                this.editTrainId();
+            }
+        },
+        // 增加列车识别号
+        addTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const model = this.formModel;
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.addTrainId.menu.operation,
+                        messages: [`添加列车识别号：成功`],
+                        val: `${model.trainNumber}::${model.trainType}::${model.serverNo}::${model.trainNo}::${model.targetCode}`
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-							this.$refs.confirmTrain.doShow(operate);
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		// 修改列车识别号
-		editTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.editTrainId.menu.operation,
-						messages: [`修改列车识别号：成功`],
-						val: this.formModel.trainNo
-					};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 修改列车识别号
+        editTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.editTrainId.menu.operation,
+                        messages: [`修改列车识别号：成功`],
+                        val: this.formModel.trainNo
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-							this.$refs.confirmTrain.doShow(operate);
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue b/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
index 755bc5736..b21f55dc9 100644
--- a/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/batong_01/menus/dialog/trainCreate.vue
@@ -1,155 +1,160 @@
 <template>
-    <el-dialog class="fuzhou_01 route-create" :title="title" :visible.sync="show" width="580px" label-position="top"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 10px 20px; border: 1px solid lightgray;">
-            <el-form size="small" label-width="100px">
-                <el-form-item label="列车:" prop="trainCode">
-                    <el-select v-model="trainCode" filterable placeholder="列车">
-                        <el-option v-for="item in trainList" :key="item.code" :label="item.trainNumber"
-                            :value="item.code"></el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="列车车次:" prop="trainNo">
+  <el-dialog
+    class="fuzhou_01 route-create"
+    v-dialogDrag
+    :title="title"
+    :visible.sync="show"
+    width="580px"
+    label-position="top"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 10px 20px; border: 1px solid lightgray;">
+      <el-form size="small" label-width="100px">
+        <el-form-item label="列车:" prop="trainCode">
+          <el-select v-model="trainCode" filterable placeholder="列车">
+            <el-option
+              v-for="item in trainList"
+              :key="item.code"
+              :label="item.trainNumber"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- <el-form-item label="列车车次:" prop="trainNo">
                     <el-select v-model="trainNo" filterable placeholder="列车车次">
                         <el-option v-for="no in trainNoList" :key="no" :label="no" :value="no"></el-option>
                     </el-select>
                     <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div>
                 </el-form-item> -->
-                <el-form-item label="列车方向:" prop="direction">
-                    <el-select v-model="direction" filterable placeholder="列车方向">
-                        <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value">
-                        </el-option>
-                    </el-select>
-                    <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
-                </el-form-item>
-            </el-form>
-            <el-row>
-                <el-col style="text-align: right;">
-                    <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-                    <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+        <el-form-item label="列车方向:" prop="direction">
+          <el-select v-model="direction" filterable placeholder="列车方向">
+            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
+          </el-select>
+          <!-- <div style="font-size: 12px;">(上行路线车次号选择偶数，下行路线车次号选择基数)</div> -->
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <el-col style="text-align: right;">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishTrainList } from '@/api/jmap/map';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteCreate',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                trainList: [],
-                trainNoList: [],
-                directionList: [
-                    {
-                        value: '2',
-                        label: '上行'
-                    },
-                    {
-                        value: '1',
-                        label: '下行'
-                    }
-                ],
-                trainCode: '',
-                trainNo: '',
-                direction: '',
-                selected: null
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return OperationEvent.Section.newtrain.menu.domId;
-            },
-            title() {
-                return '设置列车';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (Object.keys(map || {}).length) {
-                    getPublishTrainList(map.skinCode).then(response => {
-                        this.trainList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车列表失败`);
-                    })
+export default {
+    name: 'RouteCreate',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            trainList: [],
+            trainNoList: [],
+            directionList: [
+                {
+                    value: '2',
+                    label: '上行'
+                },
+                {
+                    value: '1',
+                    label: '下行'
                 }
-            },
-            doShow(operate, selected) {
-                this.dialogShow = true;
-                this.selected = selected;
+            ],
+            trainCode: '',
+            trainNo: '',
+            direction: '',
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return OperationEvent.Section.newtrain.menu.domId;
+        },
+        title() {
+            return '设置列车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.selected = selected;
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
 
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.trainCode = '';
-                this.direction = '';
-                this.loading = false;
-                this.dialogShow = false;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Section.newtrain.menu.operation,
-                    val: '' + this.direction + '::' + this.trainCode
-                }
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
+            });
+        },
+        doClose() {
+            this.trainCode = '';
+            this.direction = '';
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Section.newtrain.menu.operation,
+                val: '' + this.direction + '::' + this.trainCode
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(error => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
                     this.doClose();
-                });
-            }
+                }
+            }).catch(error => {
+                this.doClose();
+            });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue b/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
index 8d1c70e2d..c201c17f7 100644
--- a/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/beijing_01/menus/dialog/trainCreate.vue
@@ -1,151 +1,155 @@
 <template>
-    <el-dialog class="beijing-01__systerm route-create" :title="title" :visible.sync="show" width="580px"
-        label-position="top" :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false"
-        v-dialogDrag>
-        <div style="padding: 10px 20px; border: 1px solid lightgray;">
-            <el-form size="small" label-width="100px">
-                <el-form-item label="列车:" prop="trainCode">
-                    <el-select v-model="trainCode" filterable placeholder="列车">
-                        <el-option v-for="item in trainList" :key="item.code" :label="item.groupNumber"
-                            :value="item.code"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="列车方向:" prop="direction">
-                    <el-select v-model="direction" filterable placeholder="列车方向">
-                        <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-            </el-form>
-            <el-row>
-                <el-col style="text-align: right;">
-                    <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-                    <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <notice-info ref="noticeInfo"></notice-info>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm route-create"
+    :title="title"
+    :visible.sync="show"
+    width="580px"
+    label-position="top"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 10px 20px; border: 1px solid lightgray;">
+      <el-form size="small" label-width="100px">
+        <el-form-item label="列车:" prop="trainCode">
+          <el-select v-model="trainCode" filterable placeholder="列车">
+            <el-option
+              v-for="item in trainList"
+              :key="item.code"
+              :label="item.groupNumber"
+              :value="item.code"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="列车方向:" prop="direction">
+          <el-select v-model="direction" filterable placeholder="列车方向">
+            <el-option v-for="no in directionList" :key="no.value" :label="no.label" :value="no.value" />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-row>
+        <el-col style="text-align: right;">
+          <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <notice-info ref="noticeInfo" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { getPublishTrainList } from '@/api/jmap/map';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import NoticeInfo from './childDialog/childDialog/noticeInfo'
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
+import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
-    export default {
-        name: 'RouteCreate',
-        components: {
-            NoticeInfo
-        },
-        data() {
-            return {
-                dialogShow: false,
-                loading: false,
-                trainList: [],
-                trainNoList: [],
-                directionList: [
-                    {
-                        value: '2',
-                        label: '上行'
-                    },
-                    {
-                        value: '1',
-                        label: '下行'
-                    }
-                ],
-                trainCode: '',
-                tripNumber: '',
-                direction: '',
-                selected: null
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'map'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return OperationEvent.Section.newtrain.menu.domId;
-            },
-            title() {
-                return '设置列车';
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-                if (Object.keys(map || {}).length) {
-                    getPublishTrainList(map.skinCode).then(response => {
-                        this.trainList = response.data;
-                    }).catch(error => {
-                        this.$messageBox(`获取列车列表失败`);
-                    })
+export default {
+    name: 'RouteCreate',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            trainList: [],
+            trainNoList: [],
+            directionList: [
+                {
+                    value: '2',
+                    label: '上行'
+                },
+                {
+                    value: '1',
+                    label: '下行'
                 }
-            },
-            doShow(operate, selected) {
-                this.dialogShow = true;
-                this.selected = selected;
+            ],
+            trainCode: '',
+            tripNumber: '',
+            direction: '',
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return OperationEvent.Section.newtrain.menu.domId;
+        },
+        title() {
+            return '设置列车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.selected = selected;
 
-                /** 加载列车数据*/
-                this.loadInitData(this.map);
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
 
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.trainCode = '';
-                this.direction = '';
-                this.loading = false;
-                this.dialogShow = false;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                let operate = {
-                    send: true,
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Section.newtrain.menu.operation,
-                    val: '' + this.direction + '::' + this.trainCode
-                }
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
-                    this.loading = false;
+            });
+        },
+        doClose() {
+            this.trainCode = '';
+            this.direction = '';
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Section.newtrain.menu.operation,
+                val: '' + this.direction + '::' + this.trainCode
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                    this.$refs.noticeInfo.doShow(operate);
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Section.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(error => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => {
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
                     this.doClose();
-                });
-            }
+                }
+            }).catch(error => {
+                this.doClose();
+            });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue
index 5e1fc5612..e4e95d303 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainControl.vue
@@ -97,241 +97,233 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
-	name: 'TrainControl',
-	components: {
-		ConfirmTrain,
-		NoticeInfo
-	},
-	data() {
-		return {
-			trainList: [],
-			selected: null,
-			addModel: {
-				stationName: '',
-				sectionCode: '',
-				trainWindowCode: '',
-				groupNumber: '',
-				serviceNumber: '',
-				targetCode: '',
-				trainCode: '',
-				runningMode: ''
-			},
+    name: 'TrainControl',
+    components: {
+        ConfirmTrain,
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                sectionCode: '',
+                trainWindowCode: '',
+                groupNumber: '',
+                serviceNumber: '',
+                targetCode: '',
+                trainCode: '',
+                runningMode: ''
+            },
 
-			rules: {
-				stationName: [
-					{ required: true, message: '请输入车站', trigger: 'blur'}
-				],
-				sectionCode: [
-					{ required: true, message: '请输入轨道', trigger: 'blur'}
-				],
-				trainWindowCode: [
-					{ required: true, message: '请输入车次窗', trigger: 'blur'}
-				],
-				groupNumber: [
-					{ required: true, message: '请选择车组号', trigger: 'change' }
-				],
-				serviceNumber: [
-					{ required: true, message: '请输入服务号', trigger: 'blur'}
-				],
-				targetCode: [
-					{ required: true, message: '请输入目的地号', trigger: 'blur'}
-				],
-				trainCode: [
-					{ required: true, message: '请输入序列号', trigger: 'blur'}
-				],
-				runningMode: [
-					{ required: true, message: '请选择运行模式', trigger: 'blur'}
-				]
-			},
-			operation: null,
+            rules: {
+                stationName: [
+                    { required: true, message: '请输入车站', trigger: 'blur'}
+                ],
+                sectionCode: [
+                    { required: true, message: '请输入轨道', trigger: 'blur'}
+                ],
+                trainWindowCode: [
+                    { required: true, message: '请输入车次窗', trigger: 'blur'}
+                ],
+                groupNumber: [
+                    { required: true, message: '请选择车组号', trigger: 'change' }
+                ],
+                serviceNumber: [
+                    { required: true, message: '请输入服务号', trigger: 'blur'}
+                ],
+                targetCode: [
+                    { required: true, message: '请输入目的地号', trigger: 'blur'}
+                ],
+                trainCode: [
+                    { required: true, message: '请输入序列号', trigger: 'blur'}
+                ],
+                runningMode: [
+                    { required: true, message: '请选择运行模式', trigger: 'blur'}
+                ]
+            },
+            operation: null,
 
-			dialogShow: false,
-			loading: false,
-			direction: 0
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
-					/* 设目的地*/
-					return OperationEvent.Train.destinationTrainId.menu.domId;
-				} else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation) {
-					/* 设计划车*/
-					return OperationEvent.Train.setPlanTrainId.menu.domId;
-				} else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation) {
-					/* 设人工车*/
-					return OperationEvent.Train.artificialTrainId.menu.domId;
-				}
-				return '';
-			}
-			return '';
-		},
-		title() {
-			if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
-				return '设目的地车';
-			} else if ( this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
-				return '设计划车';
-			} else if ( this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
-				return '设人工车';
-			}
-			return '';
+            dialogShow: false,
+            loading: false,
+            direction: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
+                    /* 设目的地*/
+                    return OperationEvent.Train.destinationTrainId.menu.domId;
+                } else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation) {
+                    /* 设计划车*/
+                    return OperationEvent.Train.setPlanTrainId.menu.domId;
+                } else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation) {
+                    /* 设人工车*/
+                    return OperationEvent.Train.artificialTrainId.menu.domId;
+                }
+                return '';
+            }
+            return '';
+        },
+        title() {
+            if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation) {
+                return '设目的地车';
+            } else if ( this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
+                return '设计划车';
+            } else if ( this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
+                return '设人工车';
+            }
+            return '';
 
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (map) {
-				getPublishTrainList(map.skinCode).then(resp => {
-					this.trainList = resp.data;
-				}).catch(() => {
-					this.$messageBox(`获取列车车组号失败`);
-				});
-			}
-		},
-		doShow(operate, selected) {
-			this.selected = selected;
-			// 如果不是断点激活，则需要对初始值进行初始化
-			if (!this.dialogShow) {
-				this.operation = operate.operation;
-			}
-			this.addModel = {
-				tripNumber: '',
-				groupNumber: '',
-				trainType: '01',
-				serviceNumber: '',
-				targetCode: ''
-			};
-			/** 加载列车数据*/
-			this.loadInitData(this.map);
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.$store.dispatch('map/setTrainWindowShow', false);
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation ) {
-				this.destinationTrainId();
-			} else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
-				this.setPlanTrainId();
-			} else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
-				this.artificialTrainId();
-			}
-		},
-		// 设目的地车
-		destinationTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.destinationTrainId.menu.operation,
-						message: [`设目的地车：成功`],
-						val: ''
-					};
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.doClose();
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		// 设计划车
-		setPlanTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.setPlanTrainId.menu.operation,
-						message: [`设计划车：成功`],
-						val: ''
-					};
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.doClose();
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		// 设人工车
-		artificialTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.artificialTrainId.menu.operation,
-						message: [`设人工车：成功`],
-						val: ''
-					};
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.doClose();
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+            }
+            this.addModel = {
+                tripNumber: '',
+                groupNumber: '',
+                trainType: '01',
+                serviceNumber: '',
+                targetCode: ''
+            };
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            if ( this.operation == OperationEvent.Train.destinationTrainId.menu.operation ) {
+                this.destinationTrainId();
+            } else if (this.operation == OperationEvent.Train.setPlanTrainId.menu.operation ) {
+                this.setPlanTrainId();
+            } else if (this.operation == OperationEvent.Train.artificialTrainId.menu.operation ) {
+                this.artificialTrainId();
+            }
+        },
+        // 设目的地车
+        destinationTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.destinationTrainId.menu.operation,
+                        message: [`设目的地车：成功`],
+                        val: ''
+                    };
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 设计划车
+        setPlanTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.setPlanTrainId.menu.operation,
+                        message: [`设计划车：成功`],
+                        val: ''
+                    };
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 设人工车
+        artificialTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.artificialTrainId.menu.operation,
+                        message: [`设人工车：成功`],
+                        val: ''
+                    };
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.doClose();
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
 <style scoped>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
index 210adccf0..4ea1873f1 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainCreate.vue
@@ -33,121 +33,113 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
 import { mouseCancelState } from '../utils/menuItemStatus';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
-	name: 'RouteCreate',
-	components: {
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			trainList: [],
-			trainNoList: [],
-			directionList: [
-				{
-					value: '2',
-					label: '上行'
-				},
-				{
-					value: '1',
-					label: '下行'
-				}
-			],
-			trainCode: '',
-			tripNumber: '',
-			direction: '',
-			selected: null
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return OperationEvent.Section.newtrain.menu.domId;
-		},
-		title() {
-			return '设置列车';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (Object.keys(map || {}).length) {
-				getPublishTrainList(map.skinCode).then(response => {
-					this.trainList = response.data;
-				}).catch(() => {
-					this.$messageBox(`获取列车列表失败`);
-				});
-			}
-		},
-		doShow(operate, selected) {
-			this.dialogShow = true;
-			this.selected = selected;
-			console.log(this.map);
-			/** 加载列车数据*/
-			this.loadInitData(this.map);
+    name: 'RouteCreate',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            trainList: [],
+            trainNoList: [],
+            directionList: [
+                {
+                    value: '2',
+                    label: '上行'
+                },
+                {
+                    value: '1',
+                    label: '下行'
+                }
+            ],
+            trainCode: '',
+            tripNumber: '',
+            direction: '',
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return OperationEvent.Section.newtrain.menu.domId;
+        },
+        title() {
+            return '设置列车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.selected = selected;
+            console.log(this.map);
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
 
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.trainCode = '';
-			this.direction = '';
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.newtrain.menu.operation,
-				val: '' + this.direction + '::' + this.trainCode
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.trainCode = '';
+            this.direction = '';
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Section.newtrain.menu.operation,
+                val: '' + this.direction + '::' + this.trainCode
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
index 1a02f351e..ccf9241d2 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainCreateNumber.vue
@@ -1,169 +1,173 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div class="el-dialog-div">
-          <el-form size="small" label-width="80px" :model="addModel" :rules="rules" ref="form" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.stationName" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="trainWindowCode">
-                  <span slot="label">车次窗</span>
-                  <el-input v-model="addModel.trainWindowCode" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item label="车 组 号:" prop="groupNumber">
-                  <el-select v-model="addModel.groupNumber" filterable>
-                    <el-option v-for="train in trainList" :key="train.groupNumber" :label="train.groupNumber"
-                               :value="train.groupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="480px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="el-dialog-div">
+      <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules" label-position="left">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="stationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.stationName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="trainWindowCode">
+              <span slot="label">车次窗</span>
+              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
-    </el-dialog>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="车 组 号:" prop="groupNumber">
+              <el-select v-model="addModel.groupNumber" filterable>
+                <el-option
+                  v-for="train in trainList"
+                  :key="train.groupNumber"
+                  :label="train.groupNumber"
+                  :value="train.groupNumber"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
 
-    export default {
-        name: 'TrainCreateNumber',
-        components: {
+export default {
+    name: 'TrainCreateNumber',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            trainList: [],
+            selected: null,
+            addModel: {
+                stationName:'',
+                trainWindowCode: '',
+                groupNumber:''
+            },
+
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车组号', trigger: 'blur'}
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                trainNoList: [],
-                trainList: [],
-                selected: null,
-                addModel: {
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+        },
+        title() {
+            return '新建车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.addModel = {
                     stationName:'',
                     trainWindowCode: '',
-                    groupNumber:'',
-                },
-
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车组号', trigger: 'blur'}
-                    ],
-                },
-                dialogShow: false,
-                loading: false,
+                    groupNumber:''
+                };
             }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-            },
-            title() {
-                return '新建车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-              if (map) {
-                getPublishTrainList(map.skinCode).then(resp => {
-                  this.trainList = resp.data;
-                }).catch(error => {
-                  this.$messageBox(`获取列车车组号失败`);
-                });
-              }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.addModel ={
-                      stationName:'',
-                      trainWindowCode: '',
-                      groupNumber:'',
-                    }
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.createTrainNo.menu.operation,
-                        }
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.createTrainNo.menu.operation
+                    };
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
                             this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
+                        }
+                    }).catch(error => {
+                        this.loading = false;
                         this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
index b20edc78b..bf186229d 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainDeleteNumber.vue
@@ -1,164 +1,168 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-      <div class="el-dialog-div">
-        <el-form size="small" label-width="80px" :model="addModel" ref="form" label-position="left">
-          <el-row>
-            <el-col :span="11">
-              <el-form-item prop="stationName">
-                <span slot="label">车站</span>
-                <el-input v-model="addModel.stationName" :disabled="true"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="11" :offset="1">
-              <el-form-item prop="trainWindowCode">
-                <span slot="label">车次窗</span>
-                <el-input v-model="addModel.trainWindowCode" :disabled="true"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="11">
-              <el-form-item label="车 组 号:" prop="groupNumber">
-                <el-select v-model="addModel.groupNumber" filterable  disabled>
-                  <el-option v-for="train in trainList" :key="train.groupNumber" :label="train.groupNumber"
-                             :value="train.groupNumber">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <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>
-        </el-col>
-        <el-col :span="8" :offset="4">
-          <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="480px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="el-dialog-div">
+      <el-form ref="form" size="small" label-width="80px" :model="addModel" label-position="left">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="stationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.stationName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="trainWindowCode">
+              <span slot="label">车次窗</span>
+              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="车 组 号:" prop="groupNumber">
+              <el-select v-model="addModel.groupNumber" filterable disabled>
+                <el-option
+                  v-for="train in trainList"
+                  :key="train.groupNumber"
+                  :label="train.groupNumber"
+                  :value="train.groupNumber"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
 
-    export default {
-        name: 'TrainDeleteNumber',
-        components: {
+export default {
+    name: 'TrainDeleteNumber',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            trainList: [],
+            selected: null,
+            addModel: {
+                stationName:'',
+                trainWindowCode: '',
+                groupNumber:''
+            },
+
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                trainNoList: [],
-                trainList: [],
-                selected: null,
-                addModel: {
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+        },
+        title() {
+            return '删除车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.addModel = {
                     stationName:'',
                     trainWindowCode: '',
-                    groupNumber:'',
-                },
-
-                dialogShow: false,
-                loading: false,
+                    groupNumber:''
+                };
             }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-            },
-            title() {
-                return '删除车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-              if (map) {
-                getPublishTrainList(map.skinCode).then(resp => {
-                  this.trainList = resp.data;
-                }).catch(error => {
-                  this.$messageBox(`获取列车车组号失败`);
-                });
-              }
-            },
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.addModel ={
-                      stationName:'',
-                      trainWindowCode: '',
-                      groupNumber:'',
-                    }
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.deleteTrainNo.menu.operation,
-                        };
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.deleteTrainNo.menu.operation
+                    };
 
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
                             this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
+                        }
+                    }).catch(error => {
+                        this.loading = false;
                         this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
index 481d8ec49..43efab3d2 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainDetailInfo.vue
@@ -234,7 +234,6 @@
     import { mapGetters } from 'vuex';
     import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
     import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
 
     export default {
         name: 'TrainDetailInfo',
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
index f13e64a16..57b2d5a64 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainEditNumber.vue
@@ -49,125 +49,117 @@
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 import { mouseCancelState } from '../utils/menuItemStatus';
-import { getPublishTrainList } from '@/api/jmap/map';
 
 export default {
-	name: 'TrainEditNumber',
-	components: {
-	},
-	data() {
-		return {
-			trainNoList: [],
-			trainList: [],
-			selected: null,
-			addModel: {
-				stationName: '',
-				trainWindowCode: '',
-				oldGroupNumber: '',
-				newGroupNumber: ''
-			},
+    name: 'TrainEditNumber',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            trainList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                oldGroupNumber: '',
+                newGroupNumber: ''
+            },
 
-			rules: {
-				newGroupNumber: [
-					{ required: true, message: '请输入新车组号', trigger: 'blur'}
-				]
-			},
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'stationStandList'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-		},
-		title() {
-			return '修改车组号';
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (map) {
-				getPublishTrainList(map.skinCode).then(resp => {
-					this.trainList = resp.data;
-				}).catch(() => {
-					this.$messageBox(`获取列车车组号失败`);
-				});
-			}
-		},
-		doShow(operate, selected) {
-			this.selected = selected;
-			// 如果不是断点激活，则需要对初始值进行初始化
-			if (!this.dialogShow) {
-				this.addModel ={
-					stationName: '',
-					trainWindowCode: '',
-					oldGroupNumber: '',
-					newGroupNumber: ''
-				};
-			}
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.$store.dispatch('map/setTrainWindowShow', false);
-			mouseCancelState(this.selected);
-		},
-		commit() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.editTrainNo.menu.operation
-					};
+            rules: {
+                newGroupNumber: [
+                    { required: true, message: '请输入新车组号', trigger: 'blur'}
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+        },
+        title() {
+            return '修改车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.addModel = {
+                    stationName: '',
+                    trainWindowCode: '',
+                    oldGroupNumber: '',
+                    newGroupNumber: ''
+                };
+            }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.editTrainNo.menu.operation
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => { this.doClose(); });
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
 };
 </script>
 <style scoped>
diff --git a/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue b/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
index 5f39a0d23..e3f6b21bc 100644
--- a/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
+++ b/src/jmap/theme/chengdu_03/menus/dialog/trainMoveNumber.vue
@@ -1,182 +1,186 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="480px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div class="el-dialog-div">
-          <el-form size="small" label-width="90px" :model="addModel" ref="form" label-position="left">
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="stationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.stationName" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="trainWindowCode">
-                  <span slot="label">车次窗</span>
-                  <el-input v-model="addModel.trainWindowCode" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item label="车 组 号:" prop="groupNumber">
-                  <el-select v-model="addModel.groupNumber" filterable disabled>
-                    <el-option v-for="train in trainList" :key="train.groupNumber" :label="train.groupNumber"
-                               :value="train.groupNumber">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="11">
-                <el-form-item prop="purposeStationName">
-                  <span slot="label">车站</span>
-                  <el-input v-model="addModel.purposeStationName" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :offset="1">
-                <el-form-item prop="purposeTrainWindowCode" >
-                  <span slot="label">目的车次窗</span>
-                  <el-input v-model="addModel.purposeTrainWindowCode" :disabled="true"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-        <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>
-            </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="480px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div class="el-dialog-div">
+      <el-form ref="form" size="small" label-width="90px" :model="addModel" label-position="left">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="stationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.stationName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="trainWindowCode">
+              <span slot="label">车次窗</span>
+              <el-input v-model="addModel.trainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
         </el-row>
-    </el-dialog>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="车 组 号:" prop="groupNumber">
+              <el-select v-model="addModel.groupNumber" filterable disabled>
+                <el-option
+                  v-for="train in trainList"
+                  :key="train.groupNumber"
+                  :label="train.groupNumber"
+                  :value="train.groupNumber"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item prop="purposeStationName">
+              <span slot="label">车站</span>
+              <el-input v-model="addModel.purposeStationName" :disabled="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="11" :offset="1">
+            <el-form-item prop="purposeTrainWindowCode">
+              <span slot="label">目的车次窗</span>
+              <el-input v-model="addModel.purposeTrainWindowCode" :disabled="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <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>
+      </el-col>
+      <el-col :span="8" :offset="4">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-    import { mouseCancelState } from '../utils/menuItemStatus';
-    import { getPublishTrainList } from '@/api/jmap/map';
+import { mapGetters } from 'vuex';
+import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mouseCancelState } from '../utils/menuItemStatus';
 
-    export default {
-        name: 'TrainMoveNumber',
-        components: {
+export default {
+    name: 'TrainMoveNumber',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            trainList: [],
+            selected: null,
+            addModel: {
+                stationName: '',
+                trainWindowCode: '',
+                groupNumber: '',
+                purposeStationName: '',
+                purposeTrainWindowCode: ''
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                trainNoList: [],
-                trainList: [],
-                selected: null,
-                addModel: {
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
+        },
+        title() {
+            return '移动车组号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+        },
+        doShow(operate, selected) {
+            console.log('operate', operate, selected);
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.addModel = {
                     stationName: '',
                     trainWindowCode: '',
                     groupNumber: '',
                     purposeStationName: '',
-                    purposeTrainWindowCode: '',
-                },
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Train.editTrainNo.menu.domId : '';
-            },
-            title() {
-                return '移动车组号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            loadInitData(map) {
-              if (map) {
-                getPublishTrainList(map.skinCode).then(resp => {
-                  this.trainList = resp.data;
-                }).catch(error => {
-                  this.$messageBox(`获取列车车组号失败`);
-                });
-              }
-            },
-            doShow(operate, selected) {
-                console.log('operate',operate,selected);
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-                    this.addModel ={
-                      stationName: '',
-                      trainWindowCode: '',
-                      groupNumber: '',
-                      purposeStationName: '',
-                      purposeTrainWindowCode: '',
-                    }
-                }
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-                this.$store.dispatch('map/setTrainWindowShow', false);
-                mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Train.moveTrainNo.menu.operation,
-                        };
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: MapDeviceType.Train.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+                    purposeTrainWindowCode: ''
                 };
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
             }
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.moveTrainNo.menu.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .chengdou-03__systerm .el-dialog .base-label {
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
index d3f571986..963ff63a8 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainControl.vue
@@ -84,393 +84,384 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import { getPublishTrainList } from '@/api/jmap/map';
 import ConfirmTrain from './childDialog/confirmTrain';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import OperateHandler from '@/scripts/plugin/trainingOperateHandler';
 
 export default {
-	name: 'TrainControl',
-	components: {
-		ConfirmTrain,
-		NoticeInfo
-	},
-	data() {
-		return {
-			trainList: [],
-			categoryList: [
-				{ name: 'MM', value: '01' }
-			],
-			formModel: {
-				tripNumber: '',
-				groupNumber: '',
-				trainType: '01',
-				serviceNumber: '',
-				targetCode: '',
-				category: 'MM'
-			},
+    name: 'TrainControl',
+    components: {
+        ConfirmTrain,
+        NoticeInfo
+    },
+    data() {
+        return {
+            trainList: [],
+            categoryList: [
+                { name: 'MM', value: '01' }
+            ],
+            formModel: {
+                tripNumber: '',
+                groupNumber: '',
+                trainType: '01',
+                serviceNumber: '',
+                targetCode: '',
+                category: 'MM'
+            },
 
-			rules: {
-				groupNumber: [
-					{ required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
-				],
-				trainType: [
-					{ required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
-				],
-				serviceNumber: [
-					{ required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
-				],
-				tripNumber: [
-					{ required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-				],
-				targetCode: [
-					{ required: true, message: this.$t('rules.enterTheTargetCode'), trigger: 'blur' }
-				]
-			},
-			operation: null,
-			dialogShow: false,
-			loading: false,
-			direction: 0
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		trainNoIsDisabled() {
-			return false;
-		},
-		serverNoIsDisabled() {
-			return true;
-		},
-		targetCodeIsDisabled() {
-			return true;
-		},
-		trainNumberIsDisabled() {
-			if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-				return true;
-			}
-			return '';
-		},
-		// trainTypeIsDisabled() {
-		// 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
-		// 		return true;
-		// 	}
-		// 	return '';
-		// },
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdTrainNumber() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainNumberChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainNumberChange.domId;
-				}
-			}
-			return '';
-		},
-		domIdTrainNo() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainNoChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainNoChange.domId;
-				}
-			}
-			return '';
-		},
-		domIdTrainType() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.trainTypeChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.trainTypeChange.domId;
-				}
-			}
-			return '';
-		},
-		domIdServerNo() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.serverNoChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.serverNoChange.domId;
-				}
-			}
-			return '';
-		},
-		domIdTargetCode() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.targetCodeChange.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.targetCodeChange.domId;
-				}
-			}
-			return '';
-		},
-		domIdConfirm() {
-			if (this.dialogShow) {
-				if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-					/** 添加列车识别号*/
-					return OperationEvent.Train.addTrainId.menu.domId;
-				} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-					/** 修改列车识别号*/
-					return OperationEvent.Train.editTrainId.menu.domId;
-				}
-			}
-			return '';
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		title() {
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				return this.$t('menu.menuTrain.addTrainId');
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				return this.$t('menu.menuTrain.editTrainId');
-			}
-			return '';
-		},
-		istargetCode() {
-			if (this.formModel.serviceNumber && this.formModel.targetCode) {
-				return false;
-			}
-			return true;
-		}
-	},
-	watch: {
-		'formModel.tripNumber': function(val) {
-			if (val.length == 4) {
-				this.trainNoChange(val);
-			} else {
-				this.formModel = {
-					groupNumber: this.formModel.groupNumber,
-					tripNumber: val,
-					trainType: this.formModel.trainType,
-					serviceNumber: '',
-					targetCode: '',
-					category: 'MM'
-				};
-			}
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (map.skinCode) {
-				getPublishTrainList(map.skinCode).then(resp => {
-					this.trainList = resp.data;
-				}).catch(() => {
-					this.$messageBox(this.$t('error.obtainTrainGroupNumberFailed'));
-				});
-			}
-		},
-		doShow(operate, selected) {
-			// 如果不是断点激活，则需要对初始值进行初始化
-			if (!this.dialogShow) {
-				this.operation = operate.operation;
-			}
-			const model = this.$store.getters['map/getDeviceByCode'](selected.code);
-			this.formModel = {
-				groupNumber: model.groupNumber,
-				tripNumber: `${model.directionCode}${model.tripNumber}`,
-				trainType: model.type,
-				serviceNumber: model.serviceNumber,
-				targetCode: model.targetCode,
-				category: 'MM'
-			};
+            rules: {
+                groupNumber: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'change' }
+                ],
+                trainType: [
+                    { required: true, message: this.$t('rules.selectATrainType'), trigger: 'change' }
+                ],
+                serviceNumber: [
+                    { required: true, message: this.$t('rules.enterTheServiceNumber'), trigger: 'blur' }
+                ],
+                tripNumber: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                targetCode: [
+                    { required: true, message: this.$t('rules.enterTheTargetCode'), trigger: 'blur' }
+                ]
+            },
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            direction: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        trainNoIsDisabled() {
+            return false;
+        },
+        serverNoIsDisabled() {
+            return true;
+        },
+        targetCodeIsDisabled() {
+            return true;
+        },
+        trainNumberIsDisabled() {
+            if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+                return true;
+            }
+            return '';
+        },
+        // trainTypeIsDisabled() {
+        // 	if (this.operation != OperationEvent.Train.addTrainId.menu.operation) {
+        // 		return true;
+        // 	}
+        // 	return '';
+        // },
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdTrainNumber() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNumberChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNumberChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTrainNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainNoChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTrainType() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.trainTypeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.trainTypeChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdServerNo() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.serverNoChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.serverNoChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdTargetCode() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.targetCodeChange.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.targetCodeChange.domId;
+                }
+            }
+            return '';
+        },
+        domIdConfirm() {
+            if (this.dialogShow) {
+                if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                    /** 添加列车识别号*/
+                    return OperationEvent.Train.addTrainId.menu.domId;
+                } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                    /** 修改列车识别号*/
+                    return OperationEvent.Train.editTrainId.menu.domId;
+                }
+            }
+            return '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        title() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.addTrainId');
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                return this.$t('menu.menuTrain.editTrainId');
+            }
+            return '';
+        },
+        istargetCode() {
+            if (this.formModel.serviceNumber && this.formModel.targetCode) {
+                return false;
+            }
+            return true;
+        }
+    },
+    watch: {
+        'formModel.tripNumber': function(val) {
+            if (val.length == 4) {
+                this.trainNoChange(val);
+            } else {
+                this.formModel = {
+                    groupNumber: this.formModel.groupNumber,
+                    tripNumber: val,
+                    trainType: this.formModel.trainType,
+                    serviceNumber: '',
+                    targetCode: '',
+                    category: 'MM'
+                };
+            }
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {},
+        doShow(operate, selected) {
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
+                this.operation = operate.operation;
+            }
+            const model = this.$store.getters['map/getDeviceByCode'](selected.code);
+            this.formModel = {
+                groupNumber: model.groupNumber,
+                tripNumber: `${model.directionCode}${model.tripNumber}`,
+                trainType: model.type,
+                serviceNumber: model.serviceNumber,
+                targetCode: model.targetCode,
+                category: 'MM'
+            };
 
-			/** 加载列车数据*/
-			this.loadInitData(this.map);
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.$store.dispatch('map/setTrainWindowShow', false);
-		},
-		trainNumberChange(groupNumber) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${groupNumber}`,
-				operation: ''
-			};
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        trainNumberChange(groupNumber) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${groupNumber}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNumberChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainTypeChange(trainType) {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				val: `${trainType}`,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainTypeChange(trainType) {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                val: `${trainType}`,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
-			}
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainTypeChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
+            }
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-				}
-			});
-		},
-		trainNoChange(tripNumber) {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Train.type,
-				val: tripNumber,
-				operation: ''
-			};
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                }
+            });
+        },
+        trainNoChange(tripNumber) {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Train.type,
+                val: tripNumber,
+                operation: ''
+            };
 
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
-			}
-			OperateHandler.backStep(1);
-			this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
-				if (valid) {
-					if (response.data) {
-						this.formModel = {
-							groupNumber: this.formModel.groupNumber,
-							tripNumber: tripNumber,
-							trainType: this.formModel.trainType,
-							serviceNumber: response.data.serviceNumber,
-							targetCode: response.data.targetCode,
-							category: 'MM'
-						};
-						this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-					} else {
-						this.formModel = {
-							groupNumber: this.formModel.groupNumber,
-							tripNumber: tripNumber,
-							trainType: this.formModel.trainType,
-							serviceNumber: '',
-							targetCode: '',
-							category: 'MM'
-						};
-					}
-				}
-			});
-		},
-		commit() {
-			if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
-				/** 增加列车识别号*/
-				this.addTrainId();
-			} else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
-				/** 修改列车识别号*/
-				this.editTrainId();
-			}
-		},
-		// 增加列车识别号
-		addTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const model = this.formModel;
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.addTrainId.menu.operation,
-						messages: [this.$t('tip.addTrainIdTip')],
-						val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
-					};
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.addTrainId.trainNoChange.operation;
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                operate.operation = OperationEvent.Train.editTrainId.trainNoChange.operation;
+            }
+            OperateHandler.backStep(1);
+            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+                if (valid) {
+                    if (response.data) {
+                        this.formModel = {
+                            groupNumber: this.formModel.groupNumber,
+                            tripNumber: tripNumber,
+                            trainType: this.formModel.trainType,
+                            serviceNumber: response.data.serviceNumber,
+                            targetCode: response.data.targetCode,
+                            category: 'MM'
+                        };
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    } else {
+                        this.formModel = {
+                            groupNumber: this.formModel.groupNumber,
+                            tripNumber: tripNumber,
+                            trainType: this.formModel.trainType,
+                            serviceNumber: '',
+                            targetCode: '',
+                            category: 'MM'
+                        };
+                    }
+                }
+            });
+        },
+        commit() {
+            if (this.operation == OperationEvent.Train.addTrainId.menu.operation) {
+                /** 增加列车识别号*/
+                this.addTrainId();
+            } else if (this.operation == OperationEvent.Train.editTrainId.menu.operation) {
+                /** 修改列车识别号*/
+                this.editTrainId();
+            }
+        },
+        // 增加列车识别号
+        addTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const model = this.formModel;
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.addTrainId.menu.operation,
+                        messages: [this.$t('tip.addTrainIdTip')],
+                        val: `${model.groupNumber}::${model.trainType}::${model.serviceNumber}::${model.tripNumber}::${model.targetCode}`
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-							this.$refs.confirmTrain.doShow(operate);
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		// 修改列车识别号
-		editTrainId() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.editTrainId.menu.operation,
-						messages: [this.$t('tip.editTrainIdTip')],
-						val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
-					};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 修改列车识别号
+        editTrainId() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.editTrainId.menu.operation,
+                        messages: [this.$t('tip.editTrainIdTip')],
+                        val: `${this.formModel.trainType}::${this.formModel.tripNumber}`
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-							this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-							this.$refs.confirmTrain.doShow(operate);
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                            this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                            this.$refs.confirmTrain.doShow(operate);
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
index f6a2d90a5..f8d52fa90 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -39,117 +39,116 @@
 <script>
 import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-// import { getPublishTrainList } from '@/api/jmap/map';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 
 export default {
-	name: 'RouteCreate',
-	components: {
-		NoticeInfo
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			trainList: [],
-			trainNoList: [],
-			directionList: [
-				{
-					value: '2',
-					label: this.$t('menu.up')
-				},
-				{
-					value: '1',
-					label: this.$t('menu.down')
-				}
-			],
-			trainCode: '',
-			tripNumber: '',
-			direction: '',
-			selected: null
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'map'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return OperationEvent.Section.newtrain.menu.domId;
-		},
-		title() {
-			return this.$t('menu.settingTrain');
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		loadInitData(map) {
-			if (map.trainList.length) {
-				this.trainList = map.trainList;
-			} else {
-				this.$messageBox(this.$t('error.getTrainListFailed'));
-			}
-		},
-		doShow(operate, selected) {
-			this.dialogShow = true;
-			this.selected = selected;
-			console.log(this.map, 111);
-			/** 加载列车数据*/
-			this.loadInitData(this.map);
+    name: 'RouteCreate',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            trainList: [],
+            trainNoList: [],
+            directionList: [
+                {
+                    value: '2',
+                    label: this.$t('menu.up')
+                },
+                {
+                    value: '1',
+                    label: this.$t('menu.down')
+                }
+            ],
+            trainCode: '',
+            tripNumber: '',
+            direction: '',
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'map'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return OperationEvent.Section.newtrain.menu.domId;
+        },
+        title() {
+            return this.$t('menu.settingTrain');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        loadInitData(map) {
+            if (map.trainList.length) {
+                this.trainList = map.trainList;
+            } else {
+                this.$messageBox(this.$t('error.getTrainListFailed'));
+            }
+        },
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.selected = selected;
+            console.log(this.map, 111);
+            /** 加载列车数据*/
+            this.loadInitData(this.map);
 
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.trainCode = '';
-			this.direction = '';
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-		},
-		commit() {
-			const operate = {
-				send: true,
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Section.newtrain.menu.operation,
-				val: '' + this.direction + '::' + this.trainCode
-			};
-			this.loading = true;
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				this.loading = false;
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.loading = false;
-				this.doClose();
-				this.$refs.noticeInfo.doShow(operate);
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Section.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.trainCode = '';
+            this.direction = '';
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                send: true,
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Section.newtrain.menu.operation,
+                val: '' + this.direction + '::' + this.trainCode
+            };
+            this.loading = true;
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow(operate);
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Section.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => {
-				this.doClose();
-			});
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.doClose();
+            });
+        }
+    }
 };
 </script>
diff --git a/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue b/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
index 04267c8ff..90174fdbc 100644
--- a/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ b/src/jmap/theme/fuzhou_01/menus/dialog/trainSwitch.vue
@@ -78,118 +78,118 @@ import { mapGetters } from 'vuex';
 import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
 export default {
-	name: 'TrainSwitch',
-	components: {
-	},
-	data() {
-		return {
-			trainNoList: [],
-			addModel: {
-				trainNumberSource: '',
-				trainSource: '',
-				stationStandSource: '',
-				trainGoal: '',
-				stationStandGoal: '',
-				trainNumberGoal: ''
-			},
+    name: 'TrainSwitch',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                trainNumberSource: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: '',
+                trainNumberGoal: ''
+            },
 
-			rules: {
-				trainNumberSource: [
-					{ required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
-				],
-				trainSource: [
-					{ required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-				],
-				stationStandSource: [
-					{ required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-				],
-				trainNumberGoal: [
-					{ required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
-				],
-				trainGoal: [
-					{ required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
-				],
-				stationStandGoal: [
-					{ required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
-				]
-			},
-			dialogShow: false,
-			loading: false
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'stationStandList'
-		]),
-		show() {
-			return this.dialogShow && !this.$store.state.menuOperation.break;
-		},
-		domIdCancel() {
-			return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-		},
-		domIdConfirm() {
-			return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
-		},
-		title() {
-			return this.$t('menu.menuTrain.moveTrainId');
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			this.$store.dispatch('training/tipReload');
-		});
-	},
-	methods: {
-		doShow(operate, selected) {
-			this.dialogShow = true;
-			this.$nextTick(function () {
-				this.$store.dispatch('training/emitTipFresh');
-			});
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.$store.dispatch('training/emitTipFresh');
-			this.$store.dispatch('map/setTrainWindowShow', false);
-		},
-		commit() {
-			this.$refs['form'].validate((valid) => {
-				if (valid) {
-					const operate = {
-						send: true,
-						type: MapDeviceType.Train.type,
-						operation: OperationEvent.Train.moveTrainId.menu.operation
-					};
+            rules: {
+                trainNumberSource: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ],
+                trainNumberGoal: [
+                    { required: true, message: this.$t('rules.selectGroupNumber'), trigger: 'blur' }
+                ],
+                trainGoal: [
+                    { required: true, message: this.$t('rules.enterTheTripNumber'), trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: this.$t('rules.selectStation'), trigger: 'change' }
+                ]
+            },
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Train.moveTrainId.menu.domId : '';
+        },
+        title() {
+            return this.$t('menu.menuTrain.switchTrainId');
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Train.moveTrainId.menu.operation
+                    };
 
-					this.loading = true;
-					this.$store.dispatch('training/next', operate).then(({ valid }) => {
-						this.loading = false;
-						if (valid) {
-							this.doClose();
-						}
-					}).catch(() => {
-						this.loading = false;
-						this.doClose();
-						// this.$refs.noticeInfo.doShow(operate);
-					});
-				} else {
-					return false;
-				}
-			});
-		},
-		cancel() {
-			const operate = {
-				type: MapDeviceType.Train.type,
-				operation: OperationEvent.Command.cancel.menu.operation
-			};
+                    this.loading = true;
+                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        }
+                    }).catch(() => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: MapDeviceType.Train.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
-				if (valid) {
-					this.doClose();
-				}
-			}).catch(() => { this.doClose(); });
-		}
-	}
+            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        }
+    }
 };
 </script>
 <style scoped>
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 419e5bfbd..52270e97c 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -8,598 +8,598 @@ import Vue from 'vue';
  * @param {Array} effectedDeviceList
  */
 function queryEffectedModels(map, device, effectedDeviceList) {
-	if (device && map) {
-		effectedDeviceList.push(device);
-		switch (device._type) {
-		// 查询ink关联项
-		case deviceType.Link:
-			// 查询Link关联的区段
-			if (map.sectionList && map.sectionList.length) {
-				map.sectionList.forEach(elem => {
-					if (elem.linkCode === device.code) {
-						queryEffectedModels(map, elem, effectedDeviceList);
-					}
-				});
-			}
+    if (device && map) {
+        effectedDeviceList.push(device);
+        switch (device._type) {
+        // 查询ink关联项
+        case deviceType.Link:
+            // 查询Link关联的区段
+            if (map.sectionList && map.sectionList.length) {
+                map.sectionList.forEach(elem => {
+                    if (elem.linkCode === device.code) {
+                        queryEffectedModels(map, elem, effectedDeviceList);
+                    }
+                });
+            }
 
-			// 查询Link关联的信号机
-			if (map.signalList && map.signalList.length) {
-				map.signalList.forEach(elem => {
-					if (elem.linkCode === device.code) {
-						effectedDeviceList.push(elem);
-					}
-				});
-			}
-			break;
-		// 移除区段关联项
-		case deviceType.Section:
-			// 查询物理区段关联的逻辑区段
-			if (map.sectionList && map.sectionList.length && device.type === '01') {
-				map.sectionList.forEach(elem => {
-					if (elem.type !== '01' && elem.parentCode === device.code) {
-						effectedDeviceList.push(elem);
-					}
-				});
-			}
+            // 查询Link关联的信号机
+            if (map.signalList && map.signalList.length) {
+                map.signalList.forEach(elem => {
+                    if (elem.linkCode === device.code) {
+                        effectedDeviceList.push(elem);
+                    }
+                });
+            }
+            break;
+            // 移除区段关联项
+        case deviceType.Section:
+            // 查询物理区段关联的逻辑区段
+            if (map.sectionList && map.sectionList.length && device.type === '01') {
+                map.sectionList.forEach(elem => {
+                    if (elem.type !== '01' && elem.parentCode === device.code) {
+                        effectedDeviceList.push(elem);
+                    }
+                });
+            }
 
-			// 查询区段关联车次窗
-			if (map.trainWindowList && map.trainWindowList.length) {
-				map.trainModelList.forEach(elem => {
-					if (elem.sectionCode == device.code) {
-						effectedDeviceList.push(elem);
-					}
-				});
-			}
+            // 查询区段关联车次窗
+            if (map.trainWindowList && map.trainWindowList.length) {
+                map.trainModelList.forEach(elem => {
+                    if (elem.sectionCode == device.code) {
+                        effectedDeviceList.push(elem);
+                    }
+                });
+            }
 
-			// 查询区段关联的道岔
-			if (map.switchList && map.switchList.length) {
-				map.switchList.forEach(elem => {
-					if (elem.sectionACode === device.code ||
+            // 查询区段关联的道岔
+            if (map.switchList && map.switchList.length) {
+                map.switchList.forEach(elem => {
+                    if (elem.sectionACode === device.code ||
 							elem.sectionBCode === device.code ||
 							elem.sectionCCode === device.code) {
-						effectedDeviceList.push(elem);
-					}
-				});
-			}
+                        effectedDeviceList.push(elem);
+                    }
+                });
+            }
 
-			// 查询区段关联的车站
-			if (map.stationList && map.stationList.length) {
-				map.stationList.forEach(elem => {
-					if (elem.sectionCode === device.code) {
-						effectedDeviceList.push(elem);
-					}
-				});
-			}
-			break;
-		}
-	}
+            // 查询区段关联的车站
+            if (map.stationList && map.stationList.length) {
+                map.stationList.forEach(elem => {
+                    if (elem.sectionCode === device.code) {
+                        effectedDeviceList.push(elem);
+                    }
+                });
+            }
+            break;
+        }
+    }
 }
 
 // 保存草稿地图绘制关系检测
 function saveMapDeviceDefaultRelations(state) {
-	if (state && state.map) {
-		const map = state.map;
-		const deviceMap = Vue.prototype.$jlmap.mapDevice;
-		// 是否集中站
-		if (map.stationControlList && map.stationControlList.length) {
-			map.stationControlList.forEach(elem => {
-				const station = deviceMap[elem.stationCode];
-				if (station) {
-					station.centralized = true;
-				}
-			});
-		}
+    if (state && state.map) {
+        const map = state.map;
+        const deviceMap = Vue.prototype.$jlmap.mapDevice;
+        // 是否集中站
+        if (map.stationControlList && map.stationControlList.length) {
+            map.stationControlList.forEach(elem => {
+                const station = deviceMap[elem.stationCode];
+                if (station) {
+                    station.centralized = true;
+                }
+            });
+        }
 
-		// 设置区段关联
-		if (map.sectionList && map.sectionList.length) {
-			map.sectionList.forEach(elem => {
-				if (elem.type !== '03') {
-					const station = deviceMap[elem.parentCode];
-					if (station) {
-						elem.stationCode = station.stationCode;
-					}
-				} else {
-					elem.parentCode = '';
-				}
+        // 设置区段关联
+        if (map.sectionList && map.sectionList.length) {
+            map.sectionList.forEach(elem => {
+                if (elem.type !== '03') {
+                    const station = deviceMap[elem.parentCode];
+                    if (station) {
+                        elem.stationCode = station.stationCode;
+                    }
+                } else {
+                    elem.parentCode = '';
+                }
 
-				if (elem.type === '01') {
-					elem.nameShow == true;
-				}
-			});
-		}
+                if (elem.type === '01') {
+                    elem.nameShow == true;
+                }
+            });
+        }
 
-		// 站台轨设置
-		if (map.stationStandList && map.stationStandList.length && map.sectionList && map.sectionList.length) {
-			map.stationStandList.forEach((stand) => {
-				const stopPoint = deviceMap[stand.stopPointCode];
-				if (stopPoint) {
-					map.sectionList.forEach(section => {
-						if (section.type === '01' &&
+        // 站台轨设置
+        if (map.stationStandList && map.stationStandList.length && map.sectionList && map.sectionList.length) {
+            map.stationStandList.forEach((stand) => {
+                const stopPoint = deviceMap[stand.stopPointCode];
+                if (stopPoint) {
+                    map.sectionList.forEach(section => {
+                        if (section.type === '01' &&
 							stopPoint.linkCode === section.linkCode &&
 							stopPoint.offset >= section.offsetLeft &&
 							stopPoint.offset <= section.offsetRight) {
-							section.isStandTrack = true;
-							if (!section.standTrackName) {
-								section.standTrackName = section.name.replace(section.name.slice(0, 2), 'ZT');
-							}
-							if (!section.standTrackNamePosition) {
-								section.standTrackNamePosition = { x: 0, y: 0 };
-							}
-						}
-					});
-				}
-			});
-		}
+                            section.isStandTrack = true;
+                            if (!section.standTrackName) {
+                                section.standTrackName = section.name.replace(section.name.slice(0, 2), 'ZT');
+                            }
+                            if (!section.standTrackNamePosition) {
+                                section.standTrackNamePosition = { x: 0, y: 0 };
+                            }
+                        }
+                    });
+                }
+            });
+        }
 
-		// 折返轨设置
-		if (map.stopPointList && map.stopPointList.length && map.sectionList && map.sectionList.length) {
-			map.stopPointList.forEach(stopPoint => {
-				if (stopPoint.isTurningPoint) {
-					map.sectionList.forEach(section => {
-						if (section.type === '01' &&
+        // 折返轨设置
+        if (map.stopPointList && map.stopPointList.length && map.sectionList && map.sectionList.length) {
+            map.stopPointList.forEach(stopPoint => {
+                if (stopPoint.isTurningPoint) {
+                    map.sectionList.forEach(section => {
+                        if (section.type === '01' &&
 							stopPoint.linkCode === section.linkCode &&
 							stopPoint.offset >= section.offsetLeft &&
 							stopPoint.offset <= section.offsetRight) {
-							section.isReentryTrack = true;
-							if (!section.reentryTrackName) {
-								section.reentryTrackName = section.name.replace(section.name.slice(0, 2), 'ZF');
-							}
-							if (!section.reentryTrackNamePosition) {
-								section.reentryTrackNamePosition = { x: 0, y: 0 };
-							}
-						}
-					});
-				}
-			});
-		}
+                            section.isReentryTrack = true;
+                            if (!section.reentryTrackName) {
+                                section.reentryTrackName = section.name.replace(section.name.slice(0, 2), 'ZF');
+                            }
+                            if (!section.reentryTrackNamePosition) {
+                                section.reentryTrackNamePosition = { x: 0, y: 0 };
+                            }
+                        }
+                    });
+                }
+            });
+        }
 
-		// 设置道岔区段
-		if (map.switchList && map.switchList.length && map.sectionList && map.sectionList.length) {
-			map.switchList.forEach(elem => {
-				const sectiona = deviceMap[elem.sectionACode];
-				if (sectiona && sectiona.type !== '03') {
-					sectiona.nameShow = false;
-					sectiona.isSwitchSection = true;
-					sectiona.relSwitchCode = elem.code;
-				}
-				const sectionb = deviceMap[elem.sectionBCode];
-				if (sectionb && sectionb.type !== '03') {
-					sectionb.nameShow = false;
-					sectionb.isSwitchSection = true;
-					sectionb.relSwitchCode = elem.code;
-				}
-				const sectionc = deviceMap[elem.sectionCCode];
-				if (sectionc && sectionc.type !== '03') {
-					sectionc.nameShow = false;
-					sectionc.isSwitchSection = true;
-					sectionc.relSwitchCode = elem.code;
-				}
-				let sectionp = '';
-				if (sectiona && sectiona.parentCode) {
-					sectionp = deviceMap[sectiona.parentCode];
-				} else if (sectionb && sectionb.parentCode) {
-					sectionp = deviceMap[sectionb.parentCode];
-				} else if (sectionc && sectionc.parentCode) {
-					sectionp = deviceMap[sectionc.parentCode];
-				}
-				if (sectionp) {
-					sectionp.relSwitchCode = elem.code;
-				}
-			});
-		}
+        // 设置道岔区段
+        if (map.switchList && map.switchList.length && map.sectionList && map.sectionList.length) {
+            map.switchList.forEach(elem => {
+                const sectiona = deviceMap[elem.sectionACode];
+                if (sectiona && sectiona.type !== '03') {
+                    sectiona.nameShow = false;
+                    sectiona.isSwitchSection = true;
+                    sectiona.relSwitchCode = elem.code;
+                }
+                const sectionb = deviceMap[elem.sectionBCode];
+                if (sectionb && sectionb.type !== '03') {
+                    sectionb.nameShow = false;
+                    sectionb.isSwitchSection = true;
+                    sectionb.relSwitchCode = elem.code;
+                }
+                const sectionc = deviceMap[elem.sectionCCode];
+                if (sectionc && sectionc.type !== '03') {
+                    sectionc.nameShow = false;
+                    sectionc.isSwitchSection = true;
+                    sectionc.relSwitchCode = elem.code;
+                }
+                let sectionp = '';
+                if (sectiona && sectiona.parentCode) {
+                    sectionp = deviceMap[sectiona.parentCode];
+                } else if (sectionb && sectionb.parentCode) {
+                    sectionp = deviceMap[sectionb.parentCode];
+                } else if (sectionc && sectionc.parentCode) {
+                    sectionp = deviceMap[sectionc.parentCode];
+                }
+                if (sectionp) {
+                    sectionp.relSwitchCode = elem.code;
+                }
+            });
+        }
 
-		// 设置图片图层
-		if (map.resourceList && map.resourceList.length) {
-			map.resourceList.forEach(elem => {
-				if (!elem.zIndex) {
-					elem.zIndex = 1;
-				}
-			});
-		}
-	}
+        // 设置图片图层
+        if (map.resourceList && map.resourceList.length) {
+            map.resourceList.forEach(elem => {
+                if (!elem.zIndex) {
+                    elem.zIndex = 1;
+                }
+            });
+        }
+    }
 }
 
 /**
  * 实训状态数据
  */
 const map = {
-	namespaced: true,
+    namespaced: true,
 
-	state: {
-		map: null, 				// 地图数据
-		dataZoom: {}, 			// 缩放位置
-		mapDevice: {},			// 解析后的地图数据
-		mapList: {}, 			// 地图数据列表
-		mapIdList: {},			// 地图数据列表(以id为标识)
-		mapViewLoadedCount: 0, 	// 地图视图加载完成标识
-		mapDataLoadedCount: 0, 	// 地图数据加载完成标识
-		trainDetails: null 		// 地图'列车详情'显示
-	},
+    state: {
+        map: null, 				// 地图数据
+        dataZoom: {}, 			// 缩放位置
+        mapDevice: {},			// 解析后的地图数据
+        mapList: {}, 			// 地图数据列表
+        mapIdList: {},			// 地图数据列表(以id为标识)
+        mapViewLoadedCount: 0, 	// 地图视图加载完成标识
+        mapDataLoadedCount: 0, 	// 地图数据加载完成标识
+        trainDetails: null 		// 地图'列车详情'显示
+    },
 
-	getters: {
-		mapList: (state) => {
-			return state.mapList;
-		},
-		map: (state) => {
-			return state.map;
-		},
-		skinCode: (state) => {
-			if (state.map && state.map.skinVO) {
-				return state.map.skinVO.code;
-			}
-		},
-		name: (state) => {
-			if (state.map) {
-				return state.map.name;
-			} else {
-				return null;
-			}
-		},
-		version: (state) => {
-			if (state.map) {
-				return state.map.version;
-			} else {
-				return null;
-			}
-		},
-		linkList: (state) => {
-			if (state.map) {
-				return state.map.linkList;
-			} else {
-				return [];
-			}
-		},
-		switchList: (state) => {
-			if (state.map) {
-				return state.map.switchList;
-			} else {
-				return [];
-			}
-		},
-		buttonList: (state) => {
-			if (state.map) {
-				return state.map.buttonList;
-			} else {
-				return [];
-			}
-		},
-		signalList: (state) => {
-			if (state.map) {
-				return state.map.signalList;
-			} else {
-				return [];
-			}
-		},
-		sectionList: (state) => {
-			if (state.map) {
-				return state.map.sectionList;
-			} else {
-				return [];
-			}
-		},
-		zcList: (state) => {
-			if (state.map) {
-				return state.map.zcList;
-			} else {
-				return [];
-			}
-		},
-		tempSpeedLimitList: (state) => {
-			if (state.map) {
-				return state.map.tempSpeedLimitList;
-			} else {
-				return [];
-			}
-		},
-		lcList: (state) => {
-			if (state.map) {
-				return state.map.lcList;
-			} else {
-				return [];
-			}
-		},
-		resourceList: (state) => {
-			if (state.map) {
-				return state.map.resourceList;
-			} else {
-				return [];
-			}
-		},
-		stationList: (state) => {
-			if (state.map) {
-				return state.map.stationList;
-			} else {
-				return [];
-			}
-		},
-		stationStandList: (state) => {
-			if (state.map) {
-				return state.map.stationStandList;
-			} else {
-				return [];
-			}
-		},
-		stationControlList: (state) => {
-			if (state.map) {
-				return state.map.stationControlList;
-			} else {
-				return [];
-			}
-		},
-		counterList: (state) => {
-			if (state.map) {
-				return state.map.counterList;
-			} else {
-				return [];
-			}
-		},
-		delayShowList: (state) => {
-			if (state.map) {
-				return state.map.delayShowList;
-			} else {
-				return [];
-			}
-		},
-		lineList: (state) => {
-			if (state.map) {
-				return state.map.lineList;
-			} else {
-				return [];
-			}
-		},
-		textList: (state) => {
-			if (state.map) {
-				return state.map.textList;
-			} else {
-				return [];
-			}
-		},
-		trainWindowList: (state) => {
-			if (state.map) {
-				return state.map.trainWindowList;
-			} else {
-				return [];
-			}
-		},
-		trainList: (state) => {
-			if (state.map) {
-				return state.map.trainList;
-			} else {
-				return [];
-			}
-		},
-		trainModelList: (state) => {
-			if (state.map) {
-				return state.map.trainModelList;
-			} else {
-				return [];
-			}
-		},
-		trainDetails: (state) => {
-			return state.trainDetails;
-		},
-		getDeviceByCode: (state) => (code) => {
-			return state.mapDevice[code];
-		},
+    getters: {
+        mapList: (state) => {
+            return state.mapList;
+        },
+        map: (state) => {
+            return state.map;
+        },
+        skinCode: (state) => {
+            if (state.map && state.map.skinVO) {
+                return state.map.skinVO.code;
+            }
+        },
+        name: (state) => {
+            if (state.map) {
+                return state.map.name;
+            } else {
+                return null;
+            }
+        },
+        version: (state) => {
+            if (state.map) {
+                return state.map.version;
+            } else {
+                return null;
+            }
+        },
+        linkList: (state) => {
+            if (state.map) {
+                return state.map.linkList;
+            } else {
+                return [];
+            }
+        },
+        switchList: (state) => {
+            if (state.map) {
+                return state.map.switchList;
+            } else {
+                return [];
+            }
+        },
+        buttonList: (state) => {
+            if (state.map) {
+                return state.map.buttonList;
+            } else {
+                return [];
+            }
+        },
+        signalList: (state) => {
+            if (state.map) {
+                return state.map.signalList;
+            } else {
+                return [];
+            }
+        },
+        sectionList: (state) => {
+            if (state.map) {
+                return state.map.sectionList;
+            } else {
+                return [];
+            }
+        },
+        zcList: (state) => {
+            if (state.map) {
+                return state.map.zcList;
+            } else {
+                return [];
+            }
+        },
+        tempSpeedLimitList: (state) => {
+            if (state.map) {
+                return state.map.tempSpeedLimitList;
+            } else {
+                return [];
+            }
+        },
+        lcList: (state) => {
+            if (state.map) {
+                return state.map.lcList;
+            } else {
+                return [];
+            }
+        },
+        resourceList: (state) => {
+            if (state.map) {
+                return state.map.resourceList;
+            } else {
+                return [];
+            }
+        },
+        stationList: (state) => {
+            if (state.map) {
+                return state.map.stationList;
+            } else {
+                return [];
+            }
+        },
+        stationStandList: (state) => {
+            if (state.map) {
+                return state.map.stationStandList;
+            } else {
+                return [];
+            }
+        },
+        stationControlList: (state) => {
+            if (state.map) {
+                return state.map.stationControlList;
+            } else {
+                return [];
+            }
+        },
+        counterList: (state) => {
+            if (state.map) {
+                return state.map.counterList;
+            } else {
+                return [];
+            }
+        },
+        delayShowList: (state) => {
+            if (state.map) {
+                return state.map.delayShowList;
+            } else {
+                return [];
+            }
+        },
+        lineList: (state) => {
+            if (state.map) {
+                return state.map.lineList;
+            } else {
+                return [];
+            }
+        },
+        textList: (state) => {
+            if (state.map) {
+                return state.map.textList;
+            } else {
+                return [];
+            }
+        },
+        trainWindowList: (state) => {
+            if (state.map) {
+                return state.map.trainWindowList;
+            } else {
+                return [];
+            }
+        },
+        trainList: (state) => {
+            if (state.map) {
+                return state.map.trainList;
+            } else {
+                return [];
+            }
+        },
+        trainModelList: (state) => {
+            if (state.map) {
+                return state.map.trainModelList;
+            } else {
+                return [];
+            }
+        },
+        trainDetails: (state) => {
+            return state.trainDetails;
+        },
+        getDeviceByCode: (state) => (code) => {
+            return state.mapDevice[code];
+        },
 
-		// 查询区段关联的计数器
-		getCounterBySectionCode: (state) => (code, type) => {
-			let device = null;
-			var section = state.mapDevice[code];
-			if (section) {
-				state.map.counterList.forEach(counter => {
-					if (counter.stationCode === section.model.stationCode && type == counter.type) {
-						device = state.mapDevice[counter.code];
-						return;
-					}
-				});
-			}
+        // 查询区段关联的计数器
+        getCounterBySectionCode: (state) => (code, type) => {
+            let device = null;
+            var section = state.mapDevice[code];
+            if (section) {
+                state.map.counterList.forEach(counter => {
+                    if (counter.stationCode === section.model.stationCode && type == counter.type) {
+                        device = state.mapDevice[counter.code];
+                        return;
+                    }
+                });
+            }
 
-			return device;
-		},
+            return device;
+        },
 
-		// 查询信号机关联的计数器
-		getCounterBySingalCode: (state) => (code, type) => {
-			let device = null;
-			var signal = state.mapDevice[code];
-			if (signal) {
-				state.map.counterList.forEach(counter => {
-					if (counter.stationCode === signal.model.stationCode && type == counter.type) {
-						device = state.mapDevice[counter.code];
-						return;
-					}
-				});
-			}
-			return device;
-		},
+        // 查询信号机关联的计数器
+        getCounterBySingalCode: (state) => (code, type) => {
+            let device = null;
+            var signal = state.mapDevice[code];
+            if (signal) {
+                state.map.counterList.forEach(counter => {
+                    if (counter.stationCode === signal.model.stationCode && type == counter.type) {
+                        device = state.mapDevice[counter.code];
+                        return;
+                    }
+                });
+            }
+            return device;
+        },
 
-		// 查询所属车站关联的控制模式
-		getStationControlByStationCode: (state) => (code) => {
-			let device = null;
-			if (code &&
+        // 查询所属车站关联的控制模式
+        getStationControlByStationCode: (state) => (code) => {
+            let device = null;
+            if (code &&
 				state.map &&
 				state.map.stationControlList && state.map.stationControlList.length) {
-				state.map.stationControlList.forEach(elem => {
-					if (elem.stationCode == code) {
-						device = state.mapDevice[elem.code];
-					}
-				});
-			}
+                state.map.stationControlList.forEach(elem => {
+                    if (elem.stationCode == code) {
+                        device = state.mapDevice[elem.code];
+                    }
+                });
+            }
 
-			return device;
-		}
-	},
+            return device;
+        }
+    },
 
-	mutations: {
-		setMapData: (state, map) => {
-			if (map && map.skinVO) {
-				state.map = map;
-				state.mapDevice = parser(map, map.skinVO.code);
-			} else {
-				state.mapDevice = {};
-			}
-		},
-		setDataZoom: (state, dataZoom) => {
-			state.dataZoom = dataZoom;
-		},
-		mapRender: (state, devices) => {
-			if (state.map) {
-				devices.forEach(elem => { updateMapData(state, elem); });
-			}
-			if (Vue.prototype.$jlmap) {
-				Vue.prototype.$jlmap.render(devices);
-			}
-		},
-		setTrainDetails: (state, details) => {
-			state.trainDetails = details;
-		},
-		mapViewLoadedCountIncrement: (state) => {
-			state.mapViewLoadedCount += 1;
-		},
-		mapDataLoadedCountIncrement: (state) => {
-			state.mapDataLoadedCount += 1;
-		},
-		operateTrainModel: (state, { model, type }) => {
-			if (state.map && model) {
-				const list = state.map.trainModelList || [];
-				if (type === 'ADD') {
-					const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
-					if (index < 0) {
-						list.push(Object.assign({}, model));
-					}
-				} else if (type === 'UPT') {
-					const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
-					if (index >= 0) {
-						for (var prop in model) {
-							list[index][prop] = model[prop];
-						}
-					}
-				} else if (type === 'DEL') {
-					const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
-					if (index >= 0) {
-						list.splice(index, 1);
-					}
+    mutations: {
+        setMapData: (state, map) => {
+            if (map && map.skinVO) {
+                state.map = map;
+                state.mapDevice = parser(map, map.skinVO.code);
+            } else {
+                state.mapDevice = {};
+            }
+        },
+        setDataZoom: (state, dataZoom) => {
+            state.dataZoom = dataZoom;
+        },
+        mapRender: (state, devices) => {
+            if (state.map) {
+                devices.forEach(elem => { updateMapData(state, elem); });
+            }
+            if (Vue.prototype.$jlmap) {
+                Vue.prototype.$jlmap.render(devices);
+            }
+        },
+        setTrainDetails: (state, details) => {
+            state.trainDetails = details;
+        },
+        mapViewLoadedCountIncrement: (state) => {
+            state.mapViewLoadedCount += 1;
+        },
+        mapDataLoadedCountIncrement: (state) => {
+            state.mapDataLoadedCount += 1;
+        },
+        operateTrainModel: (state, { model, type }) => {
+            if (state.map && model) {
+                const list = state.map.trainModelList || [];
+                if (type === 'ADD') {
+                    const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
+                    if (index < 0) {
+                        list.push(Object.assign({}, model));
+                    }
+                } else if (type === 'UPT') {
+                    const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
+                    if (index >= 0) {
+                        for (var prop in model) {
+                            list[index][prop] = model[prop];
+                        }
+                    }
+                } else if (type === 'DEL') {
+                    const index = list.indexOf(list.find(elem => { return elem.code === model.code; }));
+                    if (index >= 0) {
+                        list.splice(index, 1);
+                    }
 
-					const trainList = state.map.trainList;
-					trainList.forEach(elem => {
-						if (elem.modelCode == model.code) {
-							elem['_dispose'] = true;
-						}
-					});
+                    const trainList = state.map.trainList;
+                    trainList.forEach(elem => {
+                        if (elem.modelCode == model.code) {
+                            elem['_dispose'] = true;
+                        }
+                    });
 
-					if (Vue.prototype.$jlmap) {
-						Vue.prototype.$jlmap.render(trainList);
-					}
-				}
-			}
-		},
-		mapClear: (state) => {
-			state.map = null;
-			state.mapDevice = {};
-			if (Vue.prototype.$jlmap) {
-				Vue.prototype.$jlmap.clear();
-			}
-		}
-	},
+                    if (Vue.prototype.$jlmap) {
+                        Vue.prototype.$jlmap.render(trainList);
+                    }
+                }
+            }
+        },
+        mapClear: (state) => {
+            state.map = null;
+            state.mapDevice = {};
+            if (Vue.prototype.$jlmap) {
+                Vue.prototype.$jlmap.clear();
+            }
+        }
+    },
 
-	actions: {
-		mapClear: ({ commit }) => {
-			commit('mapClear');
-		},
+    actions: {
+        mapClear: ({ commit }) => {
+            commit('mapClear');
+        },
 
-		// 设置缩放位置
-		updateZoom: ({ commit }, dataZoom) => {
-			commit('setDataZoom', dataZoom);
-		},
+        // 设置缩放位置
+        updateZoom: ({ commit }, dataZoom) => {
+            commit('setDataZoom', dataZoom);
+        },
 
-		setMapData: ({ commit }, map) => {
-			commit('setMapData', map);
-		},
+        setMapData: ({ commit }, map) => {
+            commit('setMapData', map);
+        },
 
-		setTrainDetails: ({ commit }, message) => {
-			commit('setTrainDetails', message);
-		},
+        setTrainDetails: ({ commit }, message) => {
+            commit('setTrainDetails', message);
+        },
 
-		setMapDataList: ({ state }, map) => {
-			const skinVO = map.skinVO;
-			if (skinVO && skinVO.code) {
-				state.mapList[`mapDate_${skinVO.code}`] = map;
-			}
-		},
+        setMapDataList: ({ state }, map) => {
+            const skinVO = map.skinVO;
+            if (skinVO && skinVO.code) {
+                state.mapList[`mapDate_${skinVO.code}`] = map;
+            }
+        },
 
-		setMapDataIdList: ({ state }, data) => {
-			state.mapIdList[`mapDate_${data.mapId}`] = data.mapData;
-		},
+        setMapDataIdList: ({ state }, data) => {
+            state.mapIdList[`mapDate_${data.mapId}`] = data.mapData;
+        },
 
-		updateMapDevices: ({ commit }, models) => {
-			return new Promise((resolve) => {
-				if (!(models instanceof Array)) {
-					models = [models];
-				}
+        updateMapDevices: ({ commit }, models) => {
+            return new Promise((resolve) => {
+                if (!(models instanceof Array)) {
+                    models = [models];
+                }
 
-				commit('mapRender', models);
-				resolve(models);
-			});
-		},
+                commit('mapRender', models);
+                resolve(models);
+            });
+        },
 
-		deleteMapDevices: ({ commit, state }, models) => {
-			return new Promise((resolve) => {
-				if (!(models instanceof Array)) {
-					models = [models];
-				}
+        deleteMapDevices: ({ commit, state }, models) => {
+            return new Promise((resolve) => {
+                if (!(models instanceof Array)) {
+                    models = [models];
+                }
 
-				// 查找向上关联需要一起删除的设备
-				const effectedModelList = [];
-				models.forEach((device) => {
-					queryEffectedModels(state.map, device, effectedModelList);
-				});
+                // 查找向上关联需要一起删除的设备
+                const effectedModelList = [];
+                models.forEach((device) => {
+                    queryEffectedModels(state.map, device, effectedModelList);
+                });
 
-				effectedModelList.forEach(elem => { elem['_dispose'] = true; });
-				commit('mapRender', effectedModelList);
-				resolve(effectedModelList);
-			});
-		},
+                effectedModelList.forEach(elem => { elem['_dispose'] = true; });
+                commit('mapRender', effectedModelList);
+                resolve(effectedModelList);
+            });
+        },
 
-		saveMapDeviceDefaultRelations({ state }) {
-			saveMapDeviceDefaultRelations(state);
-		},
+        saveMapDeviceDefaultRelations({ state }) {
+            saveMapDeviceDefaultRelations(state);
+        },
 
-		mapViewLoaded: ({ commit }) => {
-			commit('mapViewLoadedCountIncrement');
-		},
+        mapViewLoaded: ({ commit }) => {
+            commit('mapViewLoadedCountIncrement');
+        },
 
-		mapDataLoaded: ({ commit }) => {
-			commit('mapDataLoadedCountIncrement');
-		},
+        mapDataLoaded: ({ commit }) => {
+            commit('mapDataLoadedCountIncrement');
+        },
 
-		clearJlmapTrainView: () => {
-			if (Vue.prototype.$jlmap) {
-				Vue.prototype.$jlmap.clearTrainView();
-			}
-		},
+        clearJlmapTrainView: () => {
+            if (Vue.prototype.$jlmap) {
+                Vue.prototype.$jlmap.clearTrainView();
+            }
+        },
 
-		setTrainWindowShow: ({commit, state}, show) => {
-			if (state.map) {
-				var deviceList = [];
-				var trainWindowList = state.map.trainWindowList;
+        setTrainWindowShow: ({commit, state}, show) => {
+            if (state.map) {
+                var deviceList = [];
+                var trainWindowList = state.map.trainWindowList;
 
-				if (trainWindowList && trainWindowList.length) {
-					trainWindowList.forEach(elem => {
-						elem._type = deviceType.TrainWindow;
-						elem.trainWindowShow = show;
-						deviceList.push(elem);
-					});
-				}
+                if (trainWindowList && trainWindowList.length) {
+                    trainWindowList.forEach(elem => {
+                        elem._type = deviceType.TrainWindow;
+                        elem.trainWindowShow = show;
+                        deviceList.push(elem);
+                    });
+                }
 
-				commit('mapRender', deviceList);
-			}
-		},
+                commit('mapRender', deviceList);
+            }
+        },
 
-		operateTrainModel: ({ commit }, { model, type }) => {
-			commit('operateTrainModel', { model, type });
-		}
+        operateTrainModel: ({ commit }, { model, type }) => {
+            commit('operateTrainModel', { model, type });
+        }
 
-	}
+    }
 };
 
 export default map;
diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js
index 81ce9aad7..0856cda22 100644
--- a/src/utils/loaddata.js
+++ b/src/utils/loaddata.js
@@ -6,61 +6,61 @@ import { getPublishMapVersion, getPublishMapDetail, getPublishMapVersionById, ge
 // 先设置地图数据
 // 清除列车数据
 export function loadMapData(skinCode) {
-	return new Promise((resolve, reject) => {
-		getPublishMapVersion(skinCode).then(resp => {
-			var version = resp.data;
-			var mapData = store.state.map.mapList[`mapDate_${skinCode}`];
-			if (mapData && mapData.version == version) {
-				store.dispatch('map/setMapData', mapData).then(() => {
-					store.dispatch('map/clearJlmapTrainView').then(() => {
-						resolve();
-					});
-				});
-			} else {
-				getPublishMapDetail(skinCode).then(res => {
-					mapData = res.data;
-					store.dispatch('map/setMapDataList', mapData);
-					store.dispatch('map/setMapData', mapData).then(() => {
-						store.dispatch('map/clearJlmapTrainView').then(() => {
-							resolve();
-						});
-					});
-				}).catch(error => {
-					reject(error);
-				});
-			}
-		}).catch(error => {
-			reject(error);
-		});
-	});
+    return new Promise((resolve, reject) => {
+        getPublishMapVersion(skinCode).then(resp => {
+            var version = resp.data;
+            var mapData = store.state.map.mapList[`mapDate_${skinCode}`];
+            if (mapData && mapData.version == version) {
+                store.dispatch('map/setMapData', mapData).then(() => {
+                    store.dispatch('map/clearJlmapTrainView').then(() => {
+                        resolve();
+                    });
+                });
+            } else {
+                getPublishMapDetail(skinCode).then(res => {
+                    mapData = res.data;
+                    store.dispatch('map/setMapDataList', mapData);
+                    store.dispatch('map/setMapData', mapData).then(() => {
+                        store.dispatch('map/clearJlmapTrainView').then(() => {
+                            resolve();
+                        });
+                    });
+                }).catch(error => {
+                    reject(error);
+                });
+            }
+        }).catch(error => {
+            reject(error);
+        });
+    });
 }
 
 export function loadMapDataById(mapId) {
-	return new Promise((resolve, reject) => {
-		getPublishMapVersionById(mapId).then(resp => {
-			var version = resp.data;
-			var mapData = store.state.map.mapIdList[`mapDate_${mapId}`];
-			if (mapData && mapData.version == version) {
-				store.dispatch('map/setMapData', mapData).then(() => {
-					store.dispatch('map/clearJlmapTrainView').then(() => {
-						resolve();
-					});
-				});
-			} else {
-				getPublishMapDetailById(mapId).then(res => {
-					mapData = res.data;
-					store.dispatch('map/setMapDataIdList', {mapData, mapId});
-					store.dispatch('map/setMapData', mapData).then(() => {
-						store.dispatch('map/clearJlmapTrainView').then(() => {
-							resolve();
-						});
-					});
-				}).catch(error => {
-					reject(error);
-				});
-			}
-		}).catch(error => {
-			reject(error);
-		});
-	});
+    return new Promise((resolve, reject) => {
+        getPublishMapVersionById(mapId).then(resp => {
+            var version = resp.data;
+            var mapData = store.state.map.mapIdList[`mapDate_${mapId}`];
+            if (mapData && mapData.version == version) {
+                store.dispatch('map/setMapData', mapData).then(() => {
+                    store.dispatch('map/clearJlmapTrainView').then(() => {
+                        resolve();
+                    });
+                });
+            } else {
+                getPublishMapDetailById(mapId).then(res => {
+                    mapData = res.data;
+                    store.dispatch('map/setMapDataIdList', {mapData, mapId});
+                    store.dispatch('map/setMapData', mapData).then(() => {
+                        store.dispatch('map/clearJlmapTrainView').then(() => {
+                            resolve();
+                        });
+                    });
+                }).catch(error => {
+                    reject(error);
+                });
+            }
+        }).catch(error => {
+            reject(error);
+        });
+    });
 }
diff --git a/src/views/lesson/trainingrecord/index.vue b/src/views/lesson/trainingrecord/index.vue
index 7997efa4f..efce0952d 100644
--- a/src/views/lesson/trainingrecord/index.vue
+++ b/src/views/lesson/trainingrecord/index.vue
@@ -23,70 +23,70 @@ import localStore from 'storejs';
 import drapLeft from '@/views/components/drapLeft/index';
 
 export default {
-	name: 'TrainingDraft',
-	components: {
-		TrainingCategory,
-		drapLeft
-	},
-	data() {
-		return {
-			widthLeft: localStore.get('LeftWidth') ? Number(localStore.get('LeftWidth')) : 320,
-			trainingObj: null,
-			group: ''
-		};
-	},
-	computed: {
-		width() {
-			return this.$store.state.app.width - 481 - this.widthLeft;
-		},
-		height() {
-			return this.$store.state.app.height - 90;
-		}
-	},
-	watch: {
-		'$store.state.app.windowSizeCount': function() {
-			this.resize();
-		},
-		widthLeft(val) {
-			this.resize(val);
-		},
-		$route() {
-			this.resize();
-		}
-	},
-	mounted() {
-		this.group = this.$route.query.group;
-		this.resize();
-	},
-	async beforeDestroy() {
-		if (this.group) {
-			runDiagramQuit(this.group);
-		}
-	},
-	methods: {
-		selectMapSure(data) {
-			trainingNotify({ trainingId: data.id }).then(resp => {
-				this.group = resp.data;
-				this.$router.push({ path: `${UrlConfig.lesson.record}/${data.id}/${data.name}`, query: { group: resp.data } });
-			}).catch(error => {
-				this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-			});
-		},
-		trainingStart(data) {
-			/** 区分演示和正式，需要在演示时设置lessonId为0*/
-			trainingNotify({ trainingId: data.id }).then(resp => {
-				this.$router.push({ path: `${UrlConfig.display}/record`, query: { trainingId: this.$route.params.trainingId, trainingName: this.$route.params.trainingName, group: resp.data, lessonId: 0 } });
-			}).catch(error => {
-				this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
-			});
-		},
-		drapWidth(width) {
-			this.widthLeft = Number(width);
-		},
-		resize() {
-			this.$store.dispatch('config/resize', { width: this.width, height: this.height });
-		}
-	}
+    name: 'TrainingDraft',
+    components: {
+        TrainingCategory,
+        drapLeft
+    },
+    data() {
+        return {
+            widthLeft: localStore.get('LeftWidth') ? Number(localStore.get('LeftWidth')) : 320,
+            trainingObj: null,
+            group: ''
+        };
+    },
+    computed: {
+        width() {
+            return this.$store.state.app.width - 481 - this.widthLeft;
+        },
+        height() {
+            return this.$store.state.app.height - 90;
+        }
+    },
+    watch: {
+        '$store.state.app.windowSizeCount': function() {
+            this.resize();
+        },
+        widthLeft(val) {
+            this.resize(val);
+        },
+        $route() {
+            this.resize();
+        }
+    },
+    mounted() {
+        this.group = this.$route.query.group;
+        this.resize();
+    },
+    async beforeDestroy() {
+        if (this.group) {
+            runDiagramQuit(this.group);
+        }
+    },
+    methods: {
+        selectMapSure(data) {
+            trainingNotify({ trainingId: data.id }).then(resp => {
+                this.group = resp.data;
+                this.$router.push({ path: `${UrlConfig.lesson.record}/${data.id}/${data.name}`, query: { group: resp.data } });
+            }).catch(error => {
+                this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
+            });
+        },
+        trainingStart(data) {
+            /** 区分演示和正式，需要在演示时设置lessonId为0*/
+            trainingNotify({ trainingId: data.id }).then(resp => {
+                this.$router.push({ path: `${UrlConfig.display}/record`, query: { trainingId: this.$route.params.trainingId, trainingName: this.$route.params.trainingName, group: resp.data, lessonId: 0 } });
+            }).catch(error => {
+                this.$messageBox(`${this.$t('error.createSimulationFailed')}: ${error.message}`);
+            });
+        },
+        drapWidth(width) {
+            this.widthLeft = Number(width);
+        },
+        resize() {
+            this.$store.dispatch('config/resize', { width: this.width, height: this.height });
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/lesson/trainingrecord/manage/index.vue b/src/views/lesson/trainingrecord/manage/index.vue
index 39bea1645..4fe3053c6 100644
--- a/src/views/lesson/trainingrecord/manage/index.vue
+++ b/src/views/lesson/trainingrecord/manage/index.vue
@@ -22,96 +22,96 @@ import { loadMapData } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
-	name: 'LessonDraft',
-	components: {
-		MapSystemDraft,
-		StepManage
-	},
-	data() {
-		return {
-			stationObj: null,
-			trainingObj: null,
-			widthLeft: 0
-		};
-	},
-	computed: {
-		...mapGetters('map', [
-			'mapData'
-		]),
-		group() {
-			return this.$route.query.group;
-		},
-		trainingId() {
-			return this.$route.params.trainingId;
-		},
-		width() {
-			return this.$store.state.app.width - 481 - this.widthLeft;
-		},
-		height() {
-			return this.$store.state.app.height - 90;
-		}
-	},
-	watch: {
-		$route(newVal) {
-			this.initLoadData();
-		},
-		'$store.state.map.mapViewLoadedCount': function() {
-			if (this.trainingId) {
-				getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => {
-					this.$store.dispatch('training/setTrainingData', response.data);
-				}).catch(() => {
-					this.$messageBox(this.$t('error.getMapStepsFailed'));
-					this.endViewLoading();
-				});
-			}
-		}
-	},
-	mounted() {
-		this.initLoadData();
-	},
-	beforeDestroy() {
-		this.$store.dispatch('map/mapClear');
-	},
-	methods: {
-		endViewLoading(isSuccess) {
-			if (!isSuccess) {
-				this.$store.dispatch('map/mapClear');
-			}
+    name: 'LessonDraft',
+    components: {
+        MapSystemDraft,
+        StepManage
+    },
+    data() {
+        return {
+            stationObj: null,
+            trainingObj: null,
+            widthLeft: 0
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'mapData'
+        ]),
+        group() {
+            return this.$route.query.group;
+        },
+        trainingId() {
+            return this.$route.params.trainingId;
+        },
+        width() {
+            return this.$store.state.app.width - 481 - this.widthLeft;
+        },
+        height() {
+            return this.$store.state.app.height - 90;
+        }
+    },
+    watch: {
+        $route(newVal) {
+            this.initLoadData();
+        },
+        '$store.state.map.mapViewLoadedCount': function() {
+            if (this.trainingId) {
+                getTrainingStepsDetail(this.trainingId, { group: this.group }).then(response => {
+                    this.$store.dispatch('training/setTrainingData', response.data);
+                }).catch(() => {
+                    this.$messageBox(this.$t('error.getMapStepsFailed'));
+                    this.endViewLoading();
+                });
+            }
+        }
+    },
+    mounted() {
+        this.initLoadData();
+    },
+    beforeDestroy() {
+        this.$store.dispatch('map/mapClear');
+    },
+    methods: {
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
 
-			this.$nextTick(() => {
-				EventBus.$emit('viewLoading', false);
-			});
-		},
-		initLoadData() {
-			this.$store.dispatch('training/end', TrainingMode.EDIT);
-			this.$store.dispatch('training/reset');
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        initLoadData() {
+            this.$store.dispatch('training/end', TrainingMode.EDIT);
+            this.$store.dispatch('training/reset');
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-			if (parseInt(this.trainingId)) {
-				this.trainingObj = { id: this.trainingId, name: this.$route.params.trainingName };
-				// 获取实训的详细数据
-				// 加载地图数据
-				// 设置实训数据
-				getTrainingDetail(this.trainingId).then(resp => {
-					const detail = resp.data;
-					getProductDetail(detail.prdCode).then(rest => {
-						const data = rest.data;
-						loadMapData(detail.skinCode).then(() => {
-							this.$store.dispatch('training/setPrdType', data.prdType);
-						}).catch(() => {
-							this.$messageBox(this.$t('error.loadMapDataFailed'));
-							this.endViewLoading();
-						});
-					});
-				}).catch(() => {
-					this.$messageBox(this.$t('error.getMapDetailFailed'));
-					this.endViewLoading();
-				});
-			} else {
-				this.endViewLoading();
-			}
-		}
-	}
+            if (parseInt(this.trainingId)) {
+                this.trainingObj = { id: this.trainingId, name: this.$route.params.trainingName };
+                // 获取实训的详细数据
+                // 加载地图数据
+                // 设置实训数据
+                getTrainingDetail(this.trainingId).then(resp => {
+                    const detail = resp.data;
+                    getProductDetail(detail.prdCode).then(rest => {
+                        const data = rest.data;
+                        loadMapData(detail.skinCode).then(() => {
+                            this.$store.dispatch('training/setPrdType', data.prdType);
+                        }).catch(() => {
+                            this.$messageBox(this.$t('error.loadMapDataFailed'));
+                            this.endViewLoading();
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(this.$t('error.getMapDetailFailed'));
+                    this.endViewLoading();
+                });
+            } else {
+                this.endViewLoading();
+            }
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>

From 2107549d72d7d021a45e8c29faad2a3f3a3c13d0 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 13:07:07 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/map/skin/{skinCode}/version;/api/map/skin/{skinCo?=
 =?UTF-8?q?de}/details?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/map.js                         |   16 -
 src/utils/loaddata.js                       |   32 +-
 src/views/display/designIndex.vue           | 1033 +++++++++--------
 src/views/display/index.vue                 |  979 ++++++++--------
 src/views/jmapTest/index.vue                |  103 --
 src/views/jointTraining/index.vue           |  662 +++++------
 src/views/planMonitor/editTool/schedule.vue | 1110 +++++++++----------
 7 files changed, 1877 insertions(+), 2058 deletions(-)
 delete mode 100644 src/views/jmapTest/index.vue

diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 470baf5f1..fea5707e3 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -17,22 +17,6 @@ export function getPublishMapListBySkinCode(skinCode) {
     });
 }
 
-/** 根据皮肤获取地图版本信息*/
-export function getPublishMapVersion(skinCode) {
-    return request({
-        url: `/api/map/skin/${skinCode}/version`,
-        method: 'get'
-    });
-}
-
-/** 根据皮肤获取发布地图详细内容*/
-export function getPublishMapDetail(skinCode) {
-    return request({
-        url: `/api/map/skin/${skinCode}/details`,
-        method: 'get'
-    });
-}
-
 /** 根据地图id获取地图版本信息*/
 export function getPublishMapVersionById(id) {
     return request({
diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js
index 0856cda22..cfa2f3d98 100644
--- a/src/utils/loaddata.js
+++ b/src/utils/loaddata.js
@@ -1,40 +1,10 @@
 import store from '@/store';
-import { getPublishMapVersion, getPublishMapDetail, getPublishMapVersionById, getPublishMapDetailById} from '@/api/jmap/map';
+import { getPublishMapVersionById, getPublishMapDetailById} from '@/api/jmap/map';
 
 // 获取地图版本数据，和store里面的map版本做比较，如果不同
 // 获取发布的地图数据
 // 先设置地图数据
 // 清除列车数据
-export function loadMapData(skinCode) {
-    return new Promise((resolve, reject) => {
-        getPublishMapVersion(skinCode).then(resp => {
-            var version = resp.data;
-            var mapData = store.state.map.mapList[`mapDate_${skinCode}`];
-            if (mapData && mapData.version == version) {
-                store.dispatch('map/setMapData', mapData).then(() => {
-                    store.dispatch('map/clearJlmapTrainView').then(() => {
-                        resolve();
-                    });
-                });
-            } else {
-                getPublishMapDetail(skinCode).then(res => {
-                    mapData = res.data;
-                    store.dispatch('map/setMapDataList', mapData);
-                    store.dispatch('map/setMapData', mapData).then(() => {
-                        store.dispatch('map/clearJlmapTrainView').then(() => {
-                            resolve();
-                        });
-                    });
-                }).catch(error => {
-                    reject(error);
-                });
-            }
-        }).catch(error => {
-            reject(error);
-        });
-    });
-}
-
 export function loadMapDataById(mapId) {
     return new Promise((resolve, reject) => {
         getPublishMapVersionById(mapId).then(resp => {
diff --git a/src/views/display/designIndex.vue b/src/views/display/designIndex.vue
index f0861581f..10b39498a 100644
--- a/src/views/display/designIndex.vue
+++ b/src/views/display/designIndex.vue
@@ -76,13 +76,12 @@ import { mapGetters } from 'vuex';
 import { getTrainingDetail, getTrainingStepsDetail } from '@/api/jmap/training';
 import { setGoodsTryUse } from '@/api/management/goods';
 import { getProductDetail } from '@/api/management/mapprd';
-import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
+import { runDiagramQuit, getSimulationInfo } from '@/api/simulation';
 import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
-import { loadMapData, loadMapDataById } from '@/utils/loaddata';
+import { loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import Vue from 'vue';
-import { UrlConfig } from '@/router/index';
 import {loadDraftScript} from '@/api/designPlatform';
 
 // 三维
@@ -90,549 +89,535 @@ import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 
 export default {
-	name: 'DisplayDraft',
-	components: {
-		RunPlanLoad,
-		RunPlanView,
-		FaultChoose,
-		AddQuest,
-		MenuExam,
-		MenuLesson,
-		MenuReplay,
-		MapSystemDraft,
-		MenuPlan,
-		MenuDemon,
-		MenuScreen,
-		MenuScript,
-		MenuSchema,
-		MenuSystemTime,
-		Jl3dSimulation,
-		Jl3dDrive,
-		Scheduling
-	},
-	props: {
-		size: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			mode: '',
-			trainingObj: {},
-			timeDemonNum: 0,
-			checkLine: null,
-			offset: 15,
-			mouseNum: 1,
-			ierval: null,
-			mouseNumTime: 0,
-			mapBox: null,
-			mapBoxP: null,
-			panelShow: true,
-			simulationShow: false,
-			drivingShow: false,
-			questId: 0, 		// 加载任务的Id
-			group: '',
-			prdTypeMap: {
-				'01': '01', 	// 现地 => 现地
-				'02': '02', 	// 行调 => 行调
-				'04': '02', 	// 司机 => 行调
-				'05': ''		// 派班 => null
-			},
-			isDrive: this.prdType == '04',
-			isShowScheduling: this.prdType == '05'
-		};
-	},
-	computed: {
-		...mapGetters([
-			'canvasWidth',
-			'canvasHeight'
-		]),
-		...mapGetters('map', [
-			'map'
-		]),
-		...mapGetters('training', [
-			'offsetStationCode'
-		]),
-		...mapGetters('config', [
-			'canvasId'
-		]),
-		width() {
-			return this.$store.state.app.width;
-		},
-		height() {
-			return this.$store.state.app.height;
-		},
-		right() {
-			return this.$store.state.config.width / 2 - 55;
-		},
-		trainingId() {
-			return this.$route.query.trainingId;
-		},
-		mapId() {
-			return this.$route.query.mapId;
-		},
-		prdType() {
-			// return this.$route.query.prdType;
-			return this.$store.state.training.prdType;
-		},
-		skinCode() {
-			return this.$route.query.skinCode;
-		},
-		isLesson() {
-			return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
-		},
-		isExam() {
-			return this.mode === 'exam';
-		},
-		isDemon() {
-			return this.mode === 'demon';
-		},
-		isScreen() {
-			return this.mode === 'dp';
-		},
-		isReplay() {
-			return this.mode === 'replay';
-		},
-		isScript() {
-			return this.mode === 'script';
-		},
-		isPlan() {
-			return this.mode === 'plan';
-		}
-		// isDrive() {
-		// 	return this.prdType == '04';
-		// },
-		// isShowScheduling() {
-		// 	return this.prdType == '05';
-		// }
-	},
-	watch: {
-		'$store.state.config.menuBarLoadedCount': function (val) {
-			this.setPosition();
-		},
-		'$store.state.map.mapViewLoadedCount': function (val) {
-			this.mapBoxP = document.getElementById(this.canvasId).children[0];
-			this.mapBox = document.getElementsByTagName('canvas');
+    name: 'DisplayDraft',
+    components: {
+        RunPlanLoad,
+        RunPlanView,
+        FaultChoose,
+        AddQuest,
+        MenuExam,
+        MenuLesson,
+        MenuReplay,
+        MapSystemDraft,
+        MenuPlan,
+        MenuDemon,
+        MenuScreen,
+        MenuScript,
+        MenuSchema,
+        MenuSystemTime,
+        Jl3dSimulation,
+        Jl3dDrive,
+        Scheduling
+    },
+    props: {
+        size: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            mode: '',
+            trainingObj: {},
+            timeDemonNum: 0,
+            checkLine: null,
+            offset: 15,
+            mouseNum: 1,
+            ierval: null,
+            mouseNumTime: 0,
+            mapBox: null,
+            mapBoxP: null,
+            panelShow: true,
+            simulationShow: false,
+            drivingShow: false,
+            questId: 0, 		// 加载任务的Id
+            group: '',
+            prdTypeMap: {
+                '01': '01', 	// 现地 => 现地
+                '02': '02', 	// 行调 => 行调
+                '04': '02', 	// 司机 => 行调
+                '05': ''		// 派班 => null
+            },
+            isDrive: this.prdType == '04',
+            isShowScheduling: this.prdType == '05'
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'canvasWidth',
+            'canvasHeight'
+        ]),
+        ...mapGetters('map', [
+            'map'
+        ]),
+        ...mapGetters('training', [
+            'offsetStationCode'
+        ]),
+        ...mapGetters('config', [
+            'canvasId'
+        ]),
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        right() {
+            return this.$store.state.config.width / 2 - 55;
+        },
+        trainingId() {
+            return this.$route.query.trainingId;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        prdType() {
+            // return this.$route.query.prdType;
+            return this.$store.state.training.prdType;
+        },
+        skinCode() {
+            return this.$route.query.skinCode;
+        },
+        isLesson() {
+            return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
+        },
+        isExam() {
+            return this.mode === 'exam';
+        },
+        isDemon() {
+            return this.mode === 'demon';
+        },
+        isScreen() {
+            return this.mode === 'dp';
+        },
+        isReplay() {
+            return this.mode === 'replay';
+        },
+        isScript() {
+            return this.mode === 'script';
+        },
+        isPlan() {
+            return this.mode === 'plan';
+        }
+        // isDrive() {
+        // 	return this.prdType == '04';
+        // },
+        // isShowScheduling() {
+        // 	return this.prdType == '05';
+        // }
+    },
+    watch: {
+        '$store.state.config.menuBarLoadedCount': function (val) {
+            this.setPosition();
+        },
+        '$store.state.map.mapViewLoadedCount': function (val) {
+            this.mapBoxP = document.getElementById(this.canvasId).children[0];
+            this.mapBox = document.getElementsByTagName('canvas');
 
-			if (this.trainingId) {
-				getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
-					this.trainingObj = resp.data;
-					this.$store.dispatch('training/setTrainingData', this.trainingObj);
-				});
-			}
+            if (this.trainingId) {
+                getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
+                    this.trainingObj = resp.data;
+                    this.$store.dispatch('training/setTrainingData', this.trainingObj);
+                });
+            }
 
-		},
-		'$store.state.training.prdType': function(val) {
-			// this.prdType=val;
-			this.isDrive=(val == '04');
-			this.isShowScheduling=(val == '05');
-		},
-		'$store.state.socket.permissionOver': function () {
-			this.$alert('用户权限已被收回', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-					this.back();
-				}
-			});
-		},
-		'$store.state.app.windowSizeCount': function() {
-			this.setWindowSize();
-		},
-		$route() {
-			this.$nextTick(() => {
-				this.initLoadData();
-			});
-		}
-	},
-	async created() {
-		this.mode = this.$route.params.mode;
-		this.group = this.$route.query.group || '';
-	},
-	async mounted() {
-		EventBus.$on('clearCheckLogin', () => {
-			this.clearCheckLogin();
-		});
+        },
+        '$store.state.training.prdType': function(val) {
+            // this.prdType=val;
+            this.isDrive = (val == '04');
+            this.isShowScheduling = (val == '05');
+        },
+        '$store.state.socket.permissionOver': function () {
+            this.$alert('用户权限已被收回', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                    this.back();
+                }
+            });
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.initLoadData();
+            });
+        }
+    },
+    async created() {
+        this.mode = this.$route.params.mode;
+        this.group = this.$route.query.group || '';
+    },
+    async mounted() {
+        EventBus.$on('clearCheckLogin', () => {
+            this.clearCheckLogin();
+        });
 
-		await this.setWindowSize();
-		await this.initLoadData();
-		this.switchMode('');
-	},
-	async beforeDestroy() {
-		await this.clearAllTimer();
-		if (!this.isReplay) {
-			await this.quit();
-		}
-		await this.$store.dispatch('training/reset');
-		await this.$store.dispatch('map/mapClear');
-		EventBus.$off('clearCheckLogin');
-	},
-	methods: {
-		// 清除检查在线定时器
-		clearAllTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-				this.ierval = null;
-			}
+        await this.setWindowSize();
+        await this.initLoadData();
+        this.switchMode('');
+    },
+    async beforeDestroy() {
+        await this.clearAllTimer();
+        if (!this.isReplay) {
+            await this.quit();
+        }
+        await this.$store.dispatch('training/reset');
+        await this.$store.dispatch('map/mapClear');
+        EventBus.$off('clearCheckLogin');
+    },
+    methods: {
+        // 清除检查在线定时器
+        clearAllTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+                this.ierval = null;
+            }
 
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-				this.checkLine = null;
-			}
-		},
-		// 设置检查在线定时器
-		checkLoginLineTimer() {
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-			}
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+                this.checkLine = null;
+            }
+        },
+        // 设置检查在线定时器
+        checkLoginLineTimer() {
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+            }
 
-			this.checkLine = setInterval(() => {
-				checkLoginLine();
-			}, 5000 * 60);
-		},
-		// 设置手标显示状态
-		checkMouseStatusTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-			}
+            this.checkLine = setInterval(() => {
+                checkLoginLine();
+            }, 5000 * 60);
+        },
+        // 设置手标显示状态
+        checkMouseStatusTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+            }
 
-			this.ierval = setInterval(() => {
-				if (this.mouseNum) {
-					this.mouseNum = 0;
-					this.mouseNumTime = 0;
-				} else {
-					this.mouseNumTime += 1;
-				}
-				if (this.mapBox) {
-					if (this.mouseNumTime >= 15) {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = 'none';
-						}
-					} else {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = '';
-						}
-					}
-				}
-			}, 1000);
-		},
-		mousemove(e) {
-			this.mouseNum = 1;
-		},
-		setPosition() {
-			this.$nextTick(() => {
-				let offset = 15;
-				const menuBar = document.getElementById('menuBar');
-				const menuTool = document.getElementById('menuTool');
-				if (menuBar) {
-					offset += (menuBar.offsetHeight || 0);
-				}
-				if (menuTool) {
-					offset += (menuTool.offsetHeight || 0);
-				}
+            this.ierval = setInterval(() => {
+                if (this.mouseNum) {
+                    this.mouseNum = 0;
+                    this.mouseNumTime = 0;
+                } else {
+                    this.mouseNumTime += 1;
+                }
+                if (this.mapBox) {
+                    if (this.mouseNumTime >= 15) {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = 'none';
+                        }
+                    } else {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = '';
+                        }
+                    }
+                }
+            }, 1000);
+        },
+        mousemove(e) {
+            this.mouseNum = 1;
+        },
+        setPosition() {
+            this.$nextTick(() => {
+                let offset = 15;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
+                if (menuBar) {
+                    offset += (menuBar.offsetHeight || 0);
+                }
+                if (menuTool) {
+                    offset += (menuTool.offsetHeight || 0);
+                }
 
-				if (this.offset != offset) {
-					this.offset = offset;
-				}
-			});
-		},
-		// 结束加载状态
-		endViewLoading(isSuccess) {
-			if (!isSuccess) {
-				this.$store.dispatch('map/mapClear');
-			}
+                if (this.offset != offset) {
+                    this.offset = offset;
+                }
+            });
+        },
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
 
-			this.$nextTick(() => {
-				EventBus.$emit('viewLoading', false);
-			});
-		},
-		// 加载仿真信息
-		async loadSimulationInfo() {
-			const resp = await getSimulationInfo(this.group);
-			if (resp && resp.code == 200) {
-				this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-				this.questId = Number(resp.data.questId) || 0;
-			}
-		},
-		// 加载地图数据
-		async initLoadData() {
-			this.$store.dispatch('training/reset');
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        // 加载仿真信息
+        async loadSimulationInfo() {
+            const resp = await getSimulationInfo(this.group);
+            if (resp && resp.code == 200) {
+                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
+                this.questId = Number(resp.data.questId) || 0;
+            }
+        },
+        // 加载地图数据
+        async initLoadData() {
+            this.$store.dispatch('training/reset');
 
-			try {
-				if (!this.isReplay) {
-					await this.loadSimulationInfo();
-				}
+            try {
+                if (!this.isReplay) {
+                    await this.loadSimulationInfo();
+                }
 
-				if (this.isReplay) {
-					await this.initLoadReplayData();
-				} else if (this.isDemon) {
-					await this.initLoadDemonData();
-				} else if (this.isScreen) {
-					await this.initLoadScreenData();
-				} else if (this.isPlan) {
-					await this.initLoadTestRunData();
-				} else if (this.isScript) {
-					await this.initLoadTaskData();
-				} else {
-					await this.initLoadLessonOrExamData();
-				}
+                if (this.isReplay) {
+                    await this.initLoadReplayData();
+                } else if (this.isDemon) {
+                    await this.initLoadDemonData();
+                } else if (this.isScreen) {
+                    await this.initLoadScreenData();
+                } else if (this.isPlan) {
+                    await this.initLoadTestRunData();
+                } else if (this.isScript) {
+                    await this.initLoadTaskData();
+                } else {
+                    await this.initLoadLessonOrExamData();
+                }
 
-				this.checkLoginLineTimer();
-				this.checkMouseStatusTimer();
-			} catch (error) {
-				this.$messageBox(`初始化失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-		// 课程和考试系统
-		async initLoadLessonOrExamData() {
-			this.$store.dispatch('training/end', null);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+                this.checkLoginLineTimer();
+                this.checkMouseStatusTimer();
+            } catch (error) {
+                this.$messageBox(`初始化失败: ${error.message}`);
+                this.endViewLoading();
+            }
+        },
+        // 课程和考试系统
+        async initLoadLessonOrExamData() {
+            this.$store.dispatch('training/end', null);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-			if (parseInt(this.trainingId)) {
-				// 设置地图数据
-				// 设置实训数据
-				const resp = await getTrainingDetail(this.trainingId);
-				if (resp && resp.code == 200) {
-					const detail = resp.data;
-					const rest = await getProductDetail(detail.prdCode);
-					if (rest && rest.code == 200) {
-						const data = rest.data;
-						await this.$store.dispatch('training/setPrdType', data.prdType);
-						await this.loadMapData(detail.skinCode);
-					}
-				} else {
-					this.$messageBox(`获取实训步骤数据失败`);
-					this.endViewLoading();
-				}
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 回放系统
-		async initLoadReplayData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '');
+            if (parseInt(this.trainingId)) {
+                // 设置地图数据
+                // 设置实训数据
+                const resp = await getTrainingDetail(this.trainingId);
+                if (resp && resp.code == 200) {
+                    const detail = resp.data;
+                    const rest = await getProductDetail(detail.prdCode);
+                    if (rest && rest.code == 200) {
+                        const data = rest.data;
+                        await this.$store.dispatch('training/setPrdType', data.prdType);
+                        await this.loadMapDataById(this.mapId);
+                    }
+                } else {
+                    this.$messageBox(`获取实训步骤数据失败`);
+                    this.endViewLoading();
+                }
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 回放系统
+        async initLoadReplayData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '');
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 仿真系统
+        async initLoadDemonData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 仿真系统
-		async initLoadDemonData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 大屏系统请求
+        async initLoadScreenData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '01');
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 任务录制系统
+        async initLoadTaskData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.switchMode('01');
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 大屏系统请求
-		async initLoadScreenData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '01');
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 测试跑车
+        async initLoadTestRunData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '01');
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 加载剧本
+        async runQuestLoadShow() {
+            this.$refs.addQuest.doShow();
+        },
+        async runAddRolesLoadShow() {
+            // this.$refs.addQuest.doShow();
+            // const row={id: this.$route.query.scriptId};
+            const row = {group: this.$route.query.group, id: this.$route.query.scriptId};
+            this.$refs.addQuest.handleLoad(1, row);
+        },
+        // 选择脚本
+        async selectQuest(row, id, mapLocation, roleName) {
+            try {
+                let prdType = '';
+                switch (roleName) {
+                case 'Attendant': {
+                    prdType = '01';
+                    break;
+                }
+                case 'Dispatcher': {
+                    prdType = '02';
+                    break;
+                }
+                case 'Driver': {
+                    prdType = '04';
+                    break;
+                }
+                case 'Repair': {
+                    prdType = '';
+                    break;
+                }
+                }
+                this.switchMode(prdType);
+                const res = await loadDraftScript(row.id, id, this.group);
+                if (res && res.code == 200) {
+                    this.questId = parseInt(row.id);
+                    if (mapLocation) {
+                        const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
+                        Vue.prototype.$jlmap.setOptions(newMapLocation);
+                    }
+                    // if (res.data && res.data.mapLocation) {
+                    // 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
+                    // 	Vue.prototype.$jlmap.setOptions(mapLocation);
+                    // }
+                }
+                if (this.$refs.menuDemon) {
+                    await this.$refs.menuDemon.initLoadPage();
+                }
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 任务录制系统
-		async initLoadTaskData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.switchMode('01');
+                if (this.$refs.menuScript) {
+                    await this.$refs.menuScript.initLoadPage();
+                }
+            } catch (error) {
+                this.$messageBox(error.message);
+            }
+        },
+        // 退出脚本
+        async quitQuest() {
+            this.questId = 0;
+        },
 
-			if (parseInt(this.mapId)) {
-				await this.loadMapDataById(this.mapId);
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 测试跑车
-		async initLoadTestRunData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '01');
+        // 通过id加载地图数据
+        async loadMapDataById(mapId) {
+            try {
+                await loadMapDataById(mapId);
+                await this.$store.dispatch('training/setMapDefaultState');
+            } catch (error) {
+                this.$messageBox(`获取地图数据失败: ${error.message}`);
+                this.endViewLoading();
+            }
+        },
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+        // 销毁仿真
+        async quit() {
+            await runDiagramQuit(this.group);
+            await this.$store.dispatch('training/over');
+        },
+        // 仿真错误时，被动退出时调用
+        async back() {
+            if (this.isExam) {
+                await this.$refs.menuExam.back();
+            } else if (this.isLesson) {
+                await this.$refs.lessonMenu.back();
+            } else if (this.isDemon) {
+                await this.$refs.menuDemon.back();
+            } else if (this.isScreen) {
+                await this.$refs.menuScreen.back();
+            } else if (this.isPlan) {
+                await this.$refs.menuPlan.back();
+            } else if (this.isScript) {
+                await this.$refs.menuScript.back();
+            }
+        },
+        // 设置使用时间
+        async tryTime(param) {
+            const data = {
+                goodsId: param.goodsId,
+                time: param.time
+            };
+            if (data.goodsId) {
+                await setGoodsTryUse(data);
+            }
+        },
+        switchMode(prdType) {
+            this.$store.dispatch('training/setPrdType', prdType);
+        },
+        hidepanel() {
+            if (this.isDrive) {
+                this.panelShow = false;
+                this.drivingShow = true;
+                this.$refs.Jl3dDrive.show(this.skinCode);
+            } else {
+                this.panelShow = false;
+                this.simulationShow = true;
+                this.$refs.Jl3dSimulation.show(this.skinCode);
+            }
+        },
+        showScheduling() {
+            this.$refs.scheduling.doShow();
+        },
+        showpanel() {
+            this.panelShow = true;
+            this.simulationShow = false;
+        },
+        showdriving() {
+            this.panelShow = true;
+            this.drivingShow = false;
+        },
+        runPlanViewShow() {
+            this.$refs.runPlanView.doShow();
+        },
+        runPlanLoadShow() {
+            this.$refs.runPlanLoad.doShow();
+        },
+        faultChooseShow() {
+            this.$refs.faultChoose.doShow();
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                const width = this.size ? this.size.width : this.width;
+                const height = this.size ? this.size.height : this.height;
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 加载剧本
-		async runQuestLoadShow() {
-			this.$refs.addQuest.doShow();
-		},
-		async runAddRolesLoadShow() {
-			// this.$refs.addQuest.doShow();
-			// const row={id: this.$route.query.scriptId};
-			const row={group: this.$route.query.group,id: this.$route.query.scriptId};
-			this.$refs.addQuest.handleLoad(1, row);
-		},
-		// 选择脚本
-		async selectQuest(row, id, mapLocation, roleName) {
-			try {
-				let prdType='';
-				switch (roleName) {
-				case 'Attendant': {
-					prdType='01';
-					break;
-				}
-				case 'Dispatcher': {
-					prdType='02';
-					break;
-				}
-				case 'Driver': {
-					prdType='04';
-					break;
-				}
-				case 'Repair': {
-					prdType='';
-					break;
-				}
-				}
-				this.switchMode(prdType);
-				const res = await loadDraftScript(row.id,id, this.group);
-				if (res && res.code == 200) {
-					this.questId = parseInt(row.id);
-					if (mapLocation) {
-						const newMapLocation={'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
-						Vue.prototype.$jlmap.setOptions(newMapLocation);
-					}
-					// if (res.data && res.data.mapLocation) {
-					// 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
-					// 	Vue.prototype.$jlmap.setOptions(mapLocation);
-					// }
-				}
-				if (this.$refs.menuDemon) {
-					await this.$refs.menuDemon.initLoadPage();
-				}
+                this.$store.dispatch('config/resize', { width, height });
 
-				if (this.$refs.menuScript) {
-					await this.$refs.menuScript.initLoadPage();
-				}
-			} catch (error) {
-				this.$messageBox(error.message);
-			}
-		},
-		// 退出脚本
-		async quitQuest() {
-			this.questId = 0;
-		},
-		// 加载地图数据
-		async loadMapData(skinCode) {
-			try {
-				await loadMapData(skinCode);
-				await this.$store.dispatch('training/setMapDefaultState');
-			} catch (error) {
-				this.$messageBox(`获取地图数据失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-
-		// 通过id加载地图数据
-		async loadMapDataById(mapId) {
-			try {
-				await loadMapDataById(mapId);
-				await this.$store.dispatch('training/setMapDefaultState');
-			} catch (error) {
-				this.$messageBox(`获取地图数据失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-
-		// 销毁仿真
-		async quit() {
-			await runDiagramQuit(this.group);
-			await this.$store.dispatch('training/over');
-		},
-		// 仿真错误时，被动退出时调用
-		async back() {
-			if (this.isExam) {
-				await this.$refs.menuExam.back();
-			} else if (this.isLesson) {
-				await this.$refs.lessonMenu.back();
-			} else if (this.isDemon) {
-				await this.$refs.menuDemon.back();
-			} else if (this.isScreen) {
-				await this.$refs.menuScreen.back();
-			} else if (this.isPlan) {
-				await this.$refs.menuPlan.back();
-			} else if (this.isScript) {
-				await this.$refs.menuScript.back();
-			}
-		},
-		// 设置使用时间
-		async tryTime(param) {
-			const data = {
-				goodsId: param.goodsId,
-				time: param.time
-			};
-			if (data.goodsId) {
-				await setGoodsTryUse(data);
-			}
-		},
-		switchMode(prdType) {
-			this.$store.dispatch('training/setPrdType', prdType);
-		},
-		hidepanel() {
-			if (this.isDrive) {
-				this.panelShow = false;
-				this.drivingShow = true;
-				this.$refs.Jl3dDrive.show(this.skinCode);
-			} else {
-				this.panelShow = false;
-				this.simulationShow = true;
-				this.$refs.Jl3dSimulation.show(this.skinCode);
-			}
-		},
-		showScheduling() {
-			this.$refs.scheduling.doShow();
-		},
-		showpanel() {
-			this.panelShow = true;
-			this.simulationShow = false;
-		},
-		showdriving() {
-			this.panelShow = true;
-			this.drivingShow = false;
-		},
-		runPlanViewShow() {
-			this.$refs.runPlanView.doShow();
-		},
-		runPlanLoadShow() {
-			this.$refs.runPlanLoad.doShow();
-		},
-		faultChooseShow() {
-			this.$refs.faultChoose.doShow();
-		},
-		setWindowSize() {
-			this.$nextTick(() => {
-				const width = this.size ? this.size.width : this.width;
-				const height = this.size ? this.size.height : this.height;
-
-				this.$store.dispatch('config/resize', { width, height });
-
-				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-			});
-		}
-	}
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+            });
+        }
+    }
 };
 </script>
 <style>
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index efa1ddac3..1178bcef7 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -79,7 +79,7 @@ import { getProductDetail } from '@/api/management/mapprd';
 import { runDiagramQuit, loadScript, getSimulationInfo } from '@/api/simulation';
 import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
-import { loadMapData, loadMapDataById } from '@/utils/loaddata';
+import { loadMapDataById } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 import Vue from 'vue';
 
@@ -88,525 +88,510 @@ import Jl3dSimulation from '@/views/jlmap3d/simulation/jl3dsimulation';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 
 export default {
-	name: 'DisplayDraft',
-	components: {
-		RunPlanLoad,
-		RunPlanView,
-		FaultChoose,
-		AddQuest,
-		MenuExam,
-		MenuLesson,
-		MenuReplay,
-		MapSystemDraft,
-		MenuPlan,
-		MenuDemon,
-		MenuScreen,
-		MenuScript,
-		MenuSchema,
-		MenuSystemTime,
-		Jl3dSimulation,
-		Jl3dDrive,
-		Scheduling
-	},
-	props: {
-		size: {
-			type: Object,
-			default() {
-				return null;
-			}
-		}
-	},
-	data() {
-		return {
-			mode: '',
-			trainingObj: {},
-			timeDemonNum: 0,
-			checkLine: null,
-			offset: 15,
-			mouseNum: 1,
-			ierval: null,
-			mouseNumTime: 0,
-			mapBox: null,
-			mapBoxP: null,
-			panelShow: true,
-			simulationShow: false,
-			drivingShow: false,
-			questId: 0, 		// 加载任务的Id
-			group: '',
-			prdTypeMap: {
-				'01': '01', 	// 现地 => 现地
-				'02': '02', 	// 行调 => 行调
-				'04': '02', 	// 司机 => 行调
-				'05': ''		// 派班 => null
-			}
-		};
-	},
-	computed: {
-		...mapGetters([
-			'canvasWidth',
-			'canvasHeight'
-		]),
-		...mapGetters('map', [
-			'map'
-		]),
-		...mapGetters('training', [
-			'offsetStationCode'
-		]),
-		...mapGetters('config', [
-			'canvasId'
-		]),
-		width() {
-			return this.$store.state.app.width;
-		},
-		height() {
-			return this.$store.state.app.height;
-		},
-		right() {
-			return this.$store.state.config.width / 2 - 55;
-		},
-		trainingId() {
-			return this.$route.query.trainingId;
-		},
-		mapId() {
-			return this.$route.query.mapId;
-		},
-		prdType() {
-			return this.$route.query.prdType;
-		},
-		skinCode() {
-			return this.$route.query.skinCode;
-		},
-		isLesson() {
-			return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
-		},
-		isExam() {
-			return this.mode === 'exam';
-		},
-		isDemon() {
-			return this.mode === 'demon';
-		},
-		isScreen() {
-			return this.mode === 'dp';
-		},
-		isReplay() {
-			return this.mode === 'replay';
-		},
-		isScript() {
-			return this.mode === 'script';
-		},
-		isPlan() {
-			return this.mode === 'plan';
-		},
-		isDrive() {
-			return this.prdType == '04';
-		},
-		isShowScheduling() {
-			return this.$route.query.prdType == '05';
-		}
-	},
-	watch: {
-		'$store.state.config.menuBarLoadedCount': function (val) {
-			this.setPosition();
-		},
-		'$store.state.map.mapViewLoadedCount': function (val) {
-			this.mapBoxP = document.getElementById(this.canvasId).children[0];
-			this.mapBox = document.getElementsByTagName('canvas');
+    name: 'DisplayDraft',
+    components: {
+        RunPlanLoad,
+        RunPlanView,
+        FaultChoose,
+        AddQuest,
+        MenuExam,
+        MenuLesson,
+        MenuReplay,
+        MapSystemDraft,
+        MenuPlan,
+        MenuDemon,
+        MenuScreen,
+        MenuScript,
+        MenuSchema,
+        MenuSystemTime,
+        Jl3dSimulation,
+        Jl3dDrive,
+        Scheduling
+    },
+    props: {
+        size: {
+            type: Object,
+            default() {
+                return null;
+            }
+        }
+    },
+    data() {
+        return {
+            mode: '',
+            trainingObj: {},
+            timeDemonNum: 0,
+            checkLine: null,
+            offset: 15,
+            mouseNum: 1,
+            ierval: null,
+            mouseNumTime: 0,
+            mapBox: null,
+            mapBoxP: null,
+            panelShow: true,
+            simulationShow: false,
+            drivingShow: false,
+            questId: 0, 		// 加载任务的Id
+            group: '',
+            prdTypeMap: {
+                '01': '01', 	// 现地 => 现地
+                '02': '02', 	// 行调 => 行调
+                '04': '02', 	// 司机 => 行调
+                '05': ''		// 派班 => null
+            }
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'canvasWidth',
+            'canvasHeight'
+        ]),
+        ...mapGetters('map', [
+            'map'
+        ]),
+        ...mapGetters('training', [
+            'offsetStationCode'
+        ]),
+        ...mapGetters('config', [
+            'canvasId'
+        ]),
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        right() {
+            return this.$store.state.config.width / 2 - 55;
+        },
+        trainingId() {
+            return this.$route.query.trainingId;
+        },
+        mapId() {
+            return this.$route.query.mapId;
+        },
+        prdType() {
+            return this.$route.query.prdType;
+        },
+        skinCode() {
+            return this.$route.query.skinCode;
+        },
+        isLesson() {
+            return this.mode === 'teach' || this.mode === 'record' || this.mode === 'manage';
+        },
+        isExam() {
+            return this.mode === 'exam';
+        },
+        isDemon() {
+            return this.mode === 'demon';
+        },
+        isScreen() {
+            return this.mode === 'dp';
+        },
+        isReplay() {
+            return this.mode === 'replay';
+        },
+        isScript() {
+            return this.mode === 'script';
+        },
+        isPlan() {
+            return this.mode === 'plan';
+        },
+        isDrive() {
+            return this.prdType == '04';
+        },
+        isShowScheduling() {
+            return this.$route.query.prdType == '05';
+        }
+    },
+    watch: {
+        '$store.state.config.menuBarLoadedCount': function (val) {
+            this.setPosition();
+        },
+        '$store.state.map.mapViewLoadedCount': function (val) {
+            this.mapBoxP = document.getElementById(this.canvasId).children[0];
+            this.mapBox = document.getElementsByTagName('canvas');
 
-			if (this.trainingId) {
-				getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
-					this.trainingObj = resp.data;
-					this.$store.dispatch('training/setTrainingData', this.trainingObj);
-				});
-			}
+            if (this.trainingId) {
+                getTrainingStepsDetail(this.trainingId, { group: this.group }).then(resp => {
+                    this.trainingObj = resp.data;
+                    this.$store.dispatch('training/setTrainingData', this.trainingObj);
+                });
+            }
 
-		},
-		'$store.state.socket.permissionOver': function () {
-			this.$alert('用户权限已被收回', '提示', {
-				confirmButtonText: '确定',
-				callback: action => {
-					this.back();
-				}
-			});
-		},
-		'size.width': function(val) {
-			this.setWindowSize();
-		},
-		'$store.state.app.windowSizeCount': function() {
-			this.setWindowSize();
-		},
-		$route() {
-			this.$nextTick(() => {
-				this.initLoadData();
-				console.log(1111);
-			});
-		}
-	},
-	async created() {
-		this.mode = this.$route.params.mode;
-		this.group = this.$route.query.group || '';
-	},
-	async mounted() {
-		EventBus.$on('clearCheckLogin', () => {
-			this.clearCheckLogin();
-		});
+        },
+        '$store.state.socket.permissionOver': function () {
+            this.$alert('用户权限已被收回', '提示', {
+                confirmButtonText: '确定',
+                callback: action => {
+                    this.back();
+                }
+            });
+        },
+        'size.width': function(val) {
+            this.setWindowSize();
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.initLoadData();
+                console.log(1111);
+            });
+        }
+    },
+    async created() {
+        this.mode = this.$route.params.mode;
+        this.group = this.$route.query.group || '';
+    },
+    async mounted() {
+        EventBus.$on('clearCheckLogin', () => {
+            this.clearCheckLogin();
+        });
 
-		await this.setWindowSize();
-		await this.initLoadData();
-	},
-	async beforeDestroy() {
-		await this.clearAllTimer();
-		if (!this.isReplay) {
-			await this.quit();
-		}
-		await this.$store.dispatch('training/reset');
-		await this.$store.dispatch('map/mapClear');
-		EventBus.$off('clearCheckLogin');
-	},
-	methods: {
-		// 清除检查在线定时器
-		clearAllTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-				this.ierval = null;
-			}
+        await this.setWindowSize();
+        await this.initLoadData();
+    },
+    async beforeDestroy() {
+        await this.clearAllTimer();
+        if (!this.isReplay) {
+            await this.quit();
+        }
+        await this.$store.dispatch('training/reset');
+        await this.$store.dispatch('map/mapClear');
+        EventBus.$off('clearCheckLogin');
+    },
+    methods: {
+        // 清除检查在线定时器
+        clearAllTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+                this.ierval = null;
+            }
 
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-				this.checkLine = null;
-			}
-		},
-		// 设置检查在线定时器
-		checkLoginLineTimer() {
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-			}
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+                this.checkLine = null;
+            }
+        },
+        // 设置检查在线定时器
+        checkLoginLineTimer() {
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+            }
 
-			this.checkLine = setInterval(() => {
-				checkLoginLine();
-			}, 5000 * 60);
-		},
-		// 设置手标显示状态
-		checkMouseStatusTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-			}
+            this.checkLine = setInterval(() => {
+                checkLoginLine();
+            }, 5000 * 60);
+        },
+        // 设置手标显示状态
+        checkMouseStatusTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+            }
 
-			this.ierval = setInterval(() => {
-				if (this.mouseNum) {
-					this.mouseNum = 0;
-					this.mouseNumTime = 0;
-				} else {
-					this.mouseNumTime += 1;
-				}
-				if (this.mapBox) {
-					if (this.mouseNumTime >= 15) {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = 'none';
-						}
-					} else {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = '';
-						}
-					}
-				}
-			}, 1000);
-		},
-		mousemove(e) {
-			this.mouseNum = 1;
-		},
-		setPosition() {
-			this.$nextTick(() => {
-				let offset = 15;
-				const menuBar = document.getElementById('menuBar');
-				const menuTool = document.getElementById('menuTool');
-				if (menuBar) {
-					offset += (menuBar.offsetHeight || 0);
-				}
-				if (menuTool) {
-					offset += (menuTool.offsetHeight || 0);
-				}
+            this.ierval = setInterval(() => {
+                if (this.mouseNum) {
+                    this.mouseNum = 0;
+                    this.mouseNumTime = 0;
+                } else {
+                    this.mouseNumTime += 1;
+                }
+                if (this.mapBox) {
+                    if (this.mouseNumTime >= 15) {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = 'none';
+                        }
+                    } else {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = '';
+                        }
+                    }
+                }
+            }, 1000);
+        },
+        mousemove(e) {
+            this.mouseNum = 1;
+        },
+        setPosition() {
+            this.$nextTick(() => {
+                let offset = 15;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
+                if (menuBar) {
+                    offset += (menuBar.offsetHeight || 0);
+                }
+                if (menuTool) {
+                    offset += (menuTool.offsetHeight || 0);
+                }
 
-				if (this.offset != offset) {
-					this.offset = offset;
-				}
-			});
-		},
-		// 结束加载状态
-		endViewLoading(isSuccess) {
-			if (!isSuccess) {
-				this.$store.dispatch('map/mapClear');
-			}
+                if (this.offset != offset) {
+                    this.offset = offset;
+                }
+            });
+        },
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
 
-			this.$nextTick(() => {
-				EventBus.$emit('viewLoading', false);
-			});
-		},
-		// 加载仿真信息
-		async loadSimulationInfo() {
-			const resp = await getSimulationInfo(this.group);
-			if (resp && resp.code == 200) {
-				this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-				this.questId = Number(resp.data.questId) || 0;
-			}
-		},
-		// 加载地图数据
-		async initLoadData() {
-			this.$store.dispatch('training/reset');
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        // 加载仿真信息
+        async loadSimulationInfo() {
+            const resp = await getSimulationInfo(this.group);
+            if (resp && resp.code == 200) {
+                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
+                this.questId = Number(resp.data.questId) || 0;
+            }
+        },
+        // 加载地图数据
+        async initLoadData() {
+            this.$store.dispatch('training/reset');
 
-			try {
-				if (!this.isReplay) {
-					await this.loadSimulationInfo();
-				}
+            try {
+                if (!this.isReplay) {
+                    await this.loadSimulationInfo();
+                }
 
-				if (this.isReplay) {
-					await this.initLoadReplayData();
-				} else if (this.isDemon) {
-					await this.initLoadDemonData();
-				} else if (this.isScreen) {
-					await this.initLoadScreenData();
-				} else if (this.isPlan) {
-					await this.initLoadTestRunData();
-				} else if (this.isScript) {
-					await this.initLoadTaskData();
-				} else {
-					await this.initLoadLessonOrExamData();
-				}
+                if (this.isReplay) {
+                    await this.initLoadReplayData();
+                } else if (this.isDemon) {
+                    await this.initLoadDemonData();
+                } else if (this.isScreen) {
+                    await this.initLoadScreenData();
+                } else if (this.isPlan) {
+                    await this.initLoadTestRunData();
+                } else if (this.isScript) {
+                    await this.initLoadTaskData();
+                } else {
+                    await this.initLoadLessonOrExamData();
+                }
 
-				this.checkLoginLineTimer();
-				this.checkMouseStatusTimer();
-			} catch (error) {
-				this.$messageBox(`初始化失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-		// 课程和考试系统
-		async initLoadLessonOrExamData() {
-			this.$store.dispatch('training/end', null);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+                this.checkLoginLineTimer();
+                this.checkMouseStatusTimer();
+            } catch (error) {
+                this.$messageBox(`初始化失败: ${error.message}`);
+                this.endViewLoading();
+            }
+        },
+        // 课程和考试系统
+        async initLoadLessonOrExamData() {
+            this.$store.dispatch('training/end', null);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-			if (parseInt(this.trainingId)) {
-				// 设置地图数据
-				// 设置实训数据
-				const resp = await getTrainingDetail(this.trainingId);
-				if (resp && resp.code == 200) {
-					const detail = resp.data;
-					const rest = await getProductDetail(detail.prdCode);
-					if (rest && rest.code == 200) {
-						const data = rest.data;
-						await this.$store.dispatch('training/setPrdType', data.prdType);
-						await this.loadMapData(detail.skinCode);
-					}
-				} else {
-					this.$messageBox(`获取实训步骤数据失败`);
-					this.endViewLoading();
-				}
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 回放系统
-		async initLoadReplayData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '');
+            if (parseInt(this.trainingId)) {
+                // 设置地图数据
+                // 设置实训数据
+                const resp = await getTrainingDetail(this.trainingId);
+                if (resp && resp.code == 200) {
+                    const detail = resp.data;
+                    const rest = await getProductDetail(detail.prdCode);
+                    if (rest && rest.code == 200) {
+                        const data = rest.data;
+                        await this.$store.dispatch('training/setPrdType', data.prdType);
+                        await this.loadMapDataById(this.mapId);
+                    }
+                } else {
+                    this.$messageBox(`获取实训步骤数据失败`);
+                    this.endViewLoading();
+                }
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 回放系统
+        async initLoadReplayData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '');
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 仿真系统
+        async initLoadDemonData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 仿真系统
-		async initLoadDemonData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', this.prdTypeMap[this.prdType]);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 大屏系统请求
+        async initLoadScreenData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '01');
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 任务录制系统
+        async initLoadTaskData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.switchMode('01');
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 大屏系统请求
-		async initLoadScreenData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '01');
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 测试跑车
+        async initLoadTestRunData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            this.$store.dispatch('training/setPrdType', '01');
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            if (parseInt(this.mapId)) {
+                await this.loadMapDataById(this.mapId);
+            } else {
+                this.endViewLoading();
+            }
+        },
+        // 加载剧本
+        async runQuestLoadShow() {
+            this.$refs.addQuest.doShow();
+        },
+        async runAddRolesLoadShow() {
+            // this.$refs.addQuest.doShow();
+            const row = {id: this.$route.query.scriptId};
+            this.$refs.addQuest.handleLoad(1, row);
+        },
+        // 选择脚本
+        async selectQuest(row, id, mapLocation, roleName) {
+            try {
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 任务录制系统
-		async initLoadTaskData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.switchMode('01');
+                const res = await loadScript(row.id, id, this.group);
+                if (res && res.code == 200) {
+                    this.questId = parseInt(row.id);
+                    if (mapLocation) {
+                        const newMapLocation = {'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
+                        Vue.prototype.$jlmap.setOptions(newMapLocation);
+                    }
+                    // if (res.data && res.data.mapLocation) {
+                    // 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
+                    // 	Vue.prototype.$jlmap.setOptions(mapLocation);
+                    // }
+                }
+                if (this.$refs.menuDemon) {
+                    await this.$refs.menuDemon.initLoadPage();
+                }
 
-			if (parseInt(this.mapId)) {
-				await this.loadMapDataById(this.mapId);
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 测试跑车
-		async initLoadTestRunData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
-			this.$store.dispatch('training/setPrdType', '01');
+                if (this.$refs.menuScript) {
+                    await this.$refs.menuScript.initLoadPage();
+                }
 
-			if (parseInt(this.skinCode)) {
-				await this.loadMapData(this.skinCode);
+            } catch (error) {
+                this.$messageBox(error.message);
+            }
+        },
+        // 退出脚本
+        async quitQuest() {
+            this.questId = 0;
+        },
+        // 通过id加载地图数据
+        async loadMapDataById(mapId) {
+            try {
+                await loadMapDataById(mapId);
+                await this.$store.dispatch('training/setMapDefaultState');
+            } catch (error) {
+                this.$messageBox(`获取地图数据失败: ${error.message}`);
+                this.endViewLoading();
+            }
+        },
 
-			} else {
-				this.endViewLoading();
-			}
-		},
-		// 加载剧本
-		async runQuestLoadShow() {
-			this.$refs.addQuest.doShow();
-		},
-		async runAddRolesLoadShow() {
-			// this.$refs.addQuest.doShow();
-			const row={id: this.$route.query.scriptId};
-			this.$refs.addQuest.handleLoad(1, row);
-		},
-		// 选择脚本
-		async selectQuest(row, id, mapLocation, roleName) {
-			try {
+        // 销毁仿真
+        async quit() {
+            await runDiagramQuit(this.group);
+            await this.$store.dispatch('training/over');
+        },
+        // 仿真错误时，被动退出时调用
+        async back() {
+            if (this.isExam) {
+                await this.$refs.menuExam.back();
+            } else if (this.isLesson) {
+                await this.$refs.lessonMenu.back();
+            } else if (this.isDemon) {
+                await this.$refs.menuDemon.back();
+            } else if (this.isScreen) {
+                await this.$refs.menuScreen.back();
+            } else if (this.isPlan) {
+                await this.$refs.menuPlan.back();
+            } else if (this.isScript) {
+                await this.$refs.menuScript.back();
+            }
+        },
+        // 设置使用时间
+        async tryTime(param) {
+            const data = {
+                goodsId: param.goodsId,
+                time: param.time
+            };
+            if (data.goodsId) {
+                await setGoodsTryUse(data);
+            }
+        },
+        switchMode(prdType) {
+            this.$store.dispatch('training/setPrdType', prdType);
+        },
+        hidepanel() {
+            if (this.isDrive) {
+                this.panelShow = false;
+                this.drivingShow = true;
+                this.$refs.Jl3dDrive.show(this.skinCode);
+            } else {
+                this.panelShow = false;
+                this.simulationShow = true;
+                this.$refs.Jl3dSimulation.show(this.skinCode);
+            }
+        },
+        showScheduling() {
+            this.$refs.scheduling.doShow();
+        },
+        showpanel() {
+            this.panelShow = true;
+            this.simulationShow = false;
+        },
+        showdriving() {
+            this.panelShow = true;
+            this.drivingShow = false;
+        },
+        runPlanViewShow() {
+            this.$refs.runPlanView.doShow();
+        },
+        runPlanLoadShow() {
+            this.$refs.runPlanLoad.doShow();
+        },
+        faultChooseShow() {
+            this.$refs.faultChoose.doShow();
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                const width = this.size ? this.size.width : this.width;
+                const height = this.size ? this.size.height : this.height;
 
-				const res = await loadScript(row.id, id, this.group);
-				if (res && res.code == 200) {
-					this.questId = parseInt(row.id);
-					if (mapLocation) {
-						const newMapLocation={'offsetX': mapLocation.x, 'offsetY': mapLocation.y, 'scaleRate': mapLocation.scale};
-						Vue.prototype.$jlmap.setOptions(newMapLocation);
-					}
-					// if (res.data && res.data.mapLocation) {
-					// 	const mapLocation={'offsetX': res.data.mapLocation.x, 'offsetY': res.data.mapLocation.y, 'scaleRate': res.data.mapLocation.scale};
-					// 	Vue.prototype.$jlmap.setOptions(mapLocation);
-					// }
-				}
-				if (this.$refs.menuDemon) {
-					await this.$refs.menuDemon.initLoadPage();
-				}
+                this.$store.dispatch('config/resize', { width, height });
 
-				if (this.$refs.menuScript) {
-					await this.$refs.menuScript.initLoadPage();
-				}
-
-			} catch (error) {
-				this.$messageBox(error.message);
-			}
-		},
-		// 退出脚本
-		async quitQuest() {
-			this.questId = 0;
-		},
-		// 加载地图数据
-		async loadMapData(skinCode) {
-			try {
-				await loadMapData(skinCode);
-				await this.$store.dispatch('training/setMapDefaultState');
-			} catch (error) {
-				this.$messageBox(`获取地图数据失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-
-		// 通过id加载地图数据
-		async loadMapDataById(mapId) {
-			try {
-				await loadMapDataById(mapId);
-				await this.$store.dispatch('training/setMapDefaultState');
-			} catch (error) {
-				this.$messageBox(`获取地图数据失败: ${error.message}`);
-				this.endViewLoading();
-			}
-		},
-
-		// 销毁仿真
-		async quit() {
-			await runDiagramQuit(this.group);
-			await this.$store.dispatch('training/over');
-		},
-		// 仿真错误时，被动退出时调用
-		async back() {
-			if (this.isExam) {
-				await this.$refs.menuExam.back();
-			} else if (this.isLesson) {
-				await this.$refs.lessonMenu.back();
-			} else if (this.isDemon) {
-				await this.$refs.menuDemon.back();
-			} else if (this.isScreen) {
-				await this.$refs.menuScreen.back();
-			} else if (this.isPlan) {
-				await this.$refs.menuPlan.back();
-			} else if (this.isScript) {
-				await this.$refs.menuScript.back();
-			}
-		},
-		// 设置使用时间
-		async tryTime(param) {
-			const data = {
-				goodsId: param.goodsId,
-				time: param.time
-			};
-			if (data.goodsId) {
-				await setGoodsTryUse(data);
-			}
-		},
-		switchMode(prdType) {
-			this.$store.dispatch('training/setPrdType', prdType);
-		},
-		hidepanel() {
-			if (this.isDrive) {
-				this.panelShow = false;
-				this.drivingShow = true;
-				this.$refs.Jl3dDrive.show(this.skinCode);
-			} else {
-				this.panelShow = false;
-				this.simulationShow = true;
-				this.$refs.Jl3dSimulation.show(this.skinCode);
-			}
-		},
-		showScheduling() {
-			this.$refs.scheduling.doShow();
-		},
-		showpanel() {
-			this.panelShow = true;
-			this.simulationShow = false;
-		},
-		showdriving() {
-			this.panelShow = true;
-			this.drivingShow = false;
-		},
-		runPlanViewShow() {
-			this.$refs.runPlanView.doShow();
-		},
-		runPlanLoadShow() {
-			this.$refs.runPlanLoad.doShow();
-		},
-		faultChooseShow() {
-			this.$refs.faultChoose.doShow();
-		},
-		setWindowSize() {
-			this.$nextTick(() => {
-				const width = this.size ? this.size.width : this.width;
-				const height = this.size ? this.size.height : this.height;
-
-				this.$store.dispatch('config/resize', { width, height });
-
-				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-			});
-		}
-	}
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+            });
+        }
+    }
 };
 </script>
 <style>
diff --git a/src/views/jmapTest/index.vue b/src/views/jmapTest/index.vue
deleted file mode 100644
index 825e1321c..000000000
--- a/src/views/jmapTest/index.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div :id="id" style="background: #000;" />
-</template>
-
-<script>
-import Jlmap from '@/jmap/map';
-import deviceType from '@/jmap/constant/deviceType';
-import { getPublishMapDetail } from '@/api/test.js';
-
-export default {
-	name: 'Jlmap',
-	data() {
-		return {
-			id: '__jmap__',
-			jmap: null
-		};
-	},
-	watch: {
-		'$store.state.app.windowSizeCount': function() {
-			this.$nextTick(() => {
-				this.jmap.resize({width: this.$store.state.app.width, height: this.$store.state.app.height});
-			});
-		}
-	},
-	mounted() {
-		document.getElementById(this.id).oncontextmenu = function (e) {
-			return false;
-		};
-
-		this.jmap = new Jlmap({
-			dom: document.getElementById(this.id),
-			config: {
-				renderer: 'canvas',
-				width: document.documentElement.clientWidth,
-				height: document.documentElement.clientHeight
-			},
-			options: {
-				scaleRate: 1,
-				offsetX: 0,
-				offsetY: 0
-			},
-			methods: {
-				dataLoaded() { console.log('dataLoaded'); },
-				viewLoaded() { console.log('viewLoaded'); },
-				stateLoaded() { console.log('stateLoaded'); },
-				viewUpdate() { console.log('viewUpdate'); },
-				stateUpdate() { console.log('stateUpdate'); }
-				// optionsUpdate() { console.log('optionsUpdate'); }
-			}
-		});
-
-		this.jmap.on('selected', this.selected);
-		this.jmap.on('contextmenu', this.contextmenu);
-
-		// const list = [];
-		// for (let i = 1; i < 20; i++) {
-		// 	for (let j = 1; j < 500; j++) {
-		// 		list.push({ code: `${(Array(3).join(0) + i).slice(-3)}${(Array(3).join(0) + j).slice(-3)}`, lp: { x: 50 + i * 120, y: 50 + j * 20 }, rp: { x: 150 + i * 120, y: 50 + j * 20 } });
-		// 	}
-		// }
-
-		// this.jmap.load({ skinVO: { code: '02' }, linkList: list });
-
-		getPublishMapDetail('02').then(resp => {
-			this.jmap.setLevelVisible([deviceType.Link], false);
-			this.jmap.setMap(resp.data);
-			// this.jmap.setDefaultState();
-		});
-
-		// this.jmap.render([
-		// 	{code: '11', type: 'Link', lp: { x: 20 , y:  100}, rp: { x: 120, y: 100 }}
-		// ]);
-
-		// this.jmap.update([
-		// 	{ code: '11', type: 'Link', status: '02' }
-		// ]);
-
-		// this.jmap.render([
-		// 	{ code: '11', type: 'Link', lp: { x: 0, y: 0 }, rp: { x: 200, y: 200 } }
-		// ]);
-
-		// this.jmap.update([]);
-	},
-	beforeDestroy() {
-		this.jmap.off('selected', this.selected);
-		this.jmap.off('contextmenu', this.contextmenu);
-		this.jmap.dispose();
-		this.jmap = null;
-	},
-	methods: {
-		selected(e) {
-			// console.log('selected', e, this.jmap);
-		},
-		contextmenu(e) {
-			// console.log('contextmenu', e);
-		}
-	}
-};
-</script>
-
-<style rel="stylesheet/scss" lang="scss">
-
-</style>
diff --git a/src/views/jointTraining/index.vue b/src/views/jointTraining/index.vue
index 81fee4a96..8d8a2aef2 100644
--- a/src/views/jointTraining/index.vue
+++ b/src/views/jointTraining/index.vue
@@ -37,7 +37,7 @@ import IbpPlate from '@/views/ibp/index';
 import { mapGetters } from 'vuex';
 import { OperateMode, TrainingMode } from '@/scripts/ConstDic';
 import { checkLoginLine } from '@/api/login';
-import { loadMapData } from '@/utils/loaddata';
+import { loadMapDataById } from '@/utils/loaddata';
 import { getUserRoles, deljointTrainRoom } from '@/api/chat';
 import { runDiagramOver, getSimulationInfo } from '@/api/simulation';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
@@ -46,345 +46,345 @@ import ibpData from '@/ibp/constant/ibpData';
 import { Message } from 'element-ui';
 
 export default {
-	name: 'JointTrainingDraft',
-	components: {
-		MapSystemDraft,
-		MenuDemonJoint,
-		MenuDemonSchema,
-		JoinFaultChoose,
-		JoinRunPlanLoad,
-		JoinRunPlanView,
-		menuSystemTime,
-		Jl3dDrive,
-		IbpPlate
-	},
-	data() {
-		return {
-			trainingObj: {},
-			checkLine: null,
-			timeDemonNum: 0,
-			offset: 10,
-			mouseNum: 1,
-			ierval: null,
-			mouseNumTime: 0,
-			mapBox: null,
-			mapBoxP: null,
-			userRole: '',
-			deviceCode: '',
-			group: '',
-			mapId: '',
-			skinCode: '',
-			simulationShow: false,
-			drivingShow: false,
-			ibpShow: false,
-			panelShow: true,
-			ibpPart: ''
-		};
-	},
-	computed: {
-		...mapGetters([
-			'canvasWidth',
-			'canvasHeight'
-		]),
-		...mapGetters('map', [
-			'map'
-		]),
-		...mapGetters('training', [
-			'offsetStationCode'
-		]),
-		...mapGetters('config', [
-			'canvasId'
-		]),
-		width() {
-			return this.$store.state.app.width;
-		},
-		height() {
-			return this.$store.state.app.height;
-		},
-		right() {
-			return this.$store.state.config.width / 2 - 55;
-		}
-	},
-	watch: {
-		'$store.state.config.menuBarLoadedCount': function (val) {
-			this.setPosition();
-		},
-		'$store.state.map.mapViewLoadedCount': function (val) {
-			this.mapBoxP = document.getElementById(this.canvasId).children[0];
-			this.mapBox = document.getElementsByTagName('canvas');
-		},
-		'$store.state.socket.permissionOver': function () {
-			this.$alert(this.$t('tip.userRightsHaveBeenReclaimed'), this.$t('tip.hint'), {
-				confirmButtonText: this.$t('global.confirm'),
-				showClose: false,
-				callback: async (action) => {
-					await this.$store.dispatch('training/over');
-					await runDiagramOver(this.group);
-					await deljointTrainRoom(this.group);
-					await this.$router.push({ path: `/trainingPlatform/detail/${this.subSystem}`, query: {mapId: this.mapId} });
-				}
-			});
-		},
-		'$store.state.socket.jointRoomInfo': function (val) { //  综合演练房间信息
-			if (val.creatorId) {
-				this.handleRoomInfo(val);
-			}
-		},
-		'$store.state.socket.chatContentList': function (val) { // 综合演练被踢出房间
-			if (val.type === 'userRoomKickOut'&&val.oneself) {
-				this.$router.push({ path: `/` });
-				this.messageInfo(this.$t('tip.beKickedOut'), 'warning');
-			}
-		},
-		'$store.state.app.windowSizeCount': function() {
-			this.setWindowSize();
-		},
-		$route() {
-			this.$nextTick(() => {
-				this.initLoadData();
-			});
-		}
-	},
-	async created() {
-		this.group = this.$route.query.group;
-		this.mapId = this.$route.query.mapId;
-		this.skinCode = this.$route.query.skinCode;
-		this.subSystem = this.$route.query.subSystem;
-		Message.closeAll();
-	},
-	async mounted() {
-		await this.setWindowSize();
-		await this.initLoadData();
-	},
-	async beforeDestroy() {
-		await this.clearAllTimer();
-		await this.$store.dispatch('training/end', null);
-		await this.$store.dispatch('training/reset');
-		await this.$store.dispatch('map/mapClear');
-		await this.$store.dispatch('training/setGroup', '');
-		Message.closeAll();
-	},
-	methods: {
-		mousemove(e) {
-			this.mouseNum = 1;
-		},
-		handleRoomInfo(data) {
-			if (data.state == '03') { // 退出房间
-				this.$router.push({ path: `/` });
-				// this.clearSubscribe();
-			} else if (data.state == '01') { // 进入准备中
-				const query = { group: this.group };
-				this.$router.push({ path: `/trainroom`, query: query });
-				// this.clearSubscribe();
-			}
-			this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息
-		},
-		// 清除检查在线定时器
-		clearAllTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-				this.ierval = null;
-			}
+    name: 'JointTrainingDraft',
+    components: {
+        MapSystemDraft,
+        MenuDemonJoint,
+        MenuDemonSchema,
+        JoinFaultChoose,
+        JoinRunPlanLoad,
+        JoinRunPlanView,
+        menuSystemTime,
+        Jl3dDrive,
+        IbpPlate
+    },
+    data() {
+        return {
+            trainingObj: {},
+            checkLine: null,
+            timeDemonNum: 0,
+            offset: 10,
+            mouseNum: 1,
+            ierval: null,
+            mouseNumTime: 0,
+            mapBox: null,
+            mapBoxP: null,
+            userRole: '',
+            deviceCode: '',
+            group: '',
+            mapId: '',
+            skinCode: '',
+            simulationShow: false,
+            drivingShow: false,
+            ibpShow: false,
+            panelShow: true,
+            ibpPart: ''
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'canvasWidth',
+            'canvasHeight'
+        ]),
+        ...mapGetters('map', [
+            'map'
+        ]),
+        ...mapGetters('training', [
+            'offsetStationCode'
+        ]),
+        ...mapGetters('config', [
+            'canvasId'
+        ]),
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        },
+        right() {
+            return this.$store.state.config.width / 2 - 55;
+        }
+    },
+    watch: {
+        '$store.state.config.menuBarLoadedCount': function (val) {
+            this.setPosition();
+        },
+        '$store.state.map.mapViewLoadedCount': function (val) {
+            this.mapBoxP = document.getElementById(this.canvasId).children[0];
+            this.mapBox = document.getElementsByTagName('canvas');
+        },
+        '$store.state.socket.permissionOver': function () {
+            this.$alert(this.$t('tip.userRightsHaveBeenReclaimed'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('global.confirm'),
+                showClose: false,
+                callback: async (action) => {
+                    await this.$store.dispatch('training/over');
+                    await runDiagramOver(this.group);
+                    await deljointTrainRoom(this.group);
+                    await this.$router.push({ path: `/trainingPlatform/detail/${this.subSystem}`, query: {mapId: this.mapId} });
+                }
+            });
+        },
+        '$store.state.socket.jointRoomInfo': function (val) { //  综合演练房间信息
+            if (val.creatorId) {
+                this.handleRoomInfo(val);
+            }
+        },
+        '$store.state.socket.chatContentList': function (val) { // 综合演练被踢出房间
+            if (val.type === 'userRoomKickOut' && val.oneself) {
+                this.$router.push({ path: `/` });
+                this.messageInfo(this.$t('tip.beKickedOut'), 'warning');
+            }
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setWindowSize();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.initLoadData();
+            });
+        }
+    },
+    async created() {
+        this.group = this.$route.query.group;
+        this.mapId = this.$route.query.mapId;
+        this.skinCode = this.$route.query.skinCode;
+        this.subSystem = this.$route.query.subSystem;
+        Message.closeAll();
+    },
+    async mounted() {
+        await this.setWindowSize();
+        await this.initLoadData();
+    },
+    async beforeDestroy() {
+        await this.clearAllTimer();
+        await this.$store.dispatch('training/end', null);
+        await this.$store.dispatch('training/reset');
+        await this.$store.dispatch('map/mapClear');
+        await this.$store.dispatch('training/setGroup', '');
+        Message.closeAll();
+    },
+    methods: {
+        mousemove(e) {
+            this.mouseNum = 1;
+        },
+        handleRoomInfo(data) {
+            if (data.state == '03') { // 退出房间
+                this.$router.push({ path: `/` });
+                // this.clearSubscribe();
+            } else if (data.state == '01') { // 进入准备中
+                const query = { group: this.group };
+                this.$router.push({ path: `/trainroom`, query: query });
+                // this.clearSubscribe();
+            }
+            this.$store.dispatch('socket/setJointRoomInfo'); // 清空房间信息
+        },
+        // 清除检查在线定时器
+        clearAllTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+                this.ierval = null;
+            }
 
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-				this.checkLine = null;
-			}
-		},
-		// 设置检查在线定时器
-		checkLoginLineTimer() {
-			if (this.checkLine) {
-				clearTimeout(this.checkLine);
-			}
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+                this.checkLine = null;
+            }
+        },
+        // 设置检查在线定时器
+        checkLoginLineTimer() {
+            if (this.checkLine) {
+                clearTimeout(this.checkLine);
+            }
 
-			this.checkLine = setInterval(() => {
-				checkLoginLine();
-			}, 5000 * 60);
-		},
-		// 设置手标显示状态
-		checkMouseStatusTimer() {
-			if (this.ierval) {
-				clearTimeout(this.ierval);
-			}
+            this.checkLine = setInterval(() => {
+                checkLoginLine();
+            }, 5000 * 60);
+        },
+        // 设置手标显示状态
+        checkMouseStatusTimer() {
+            if (this.ierval) {
+                clearTimeout(this.ierval);
+            }
 
-			this.ierval = setInterval(() => {
-				if (this.mouseNum) {
-					this.mouseNum = 0;
-					this.mouseNumTime = 0;
-				} else {
-					this.mouseNumTime += 1;
-				}
-				if (this.mapBox) {
-					if (this.mouseNumTime >= 15) {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = 'none';
-						}
-					} else {
-						for (let i = 0; i < this.mapBox.length; i++) {
-							this.mapBox[i].style.cursor = '';
-						}
-					}
-				}
-			}, 1000);
-		},
-		// 设置菜单和工具栏位置
-		setPosition() {
-			this.$nextTick(() => {
-				let offset = 10;
-				const menuBar = document.getElementById('menuBar');
-				const menuTool = document.getElementById('menuTool');
+            this.ierval = setInterval(() => {
+                if (this.mouseNum) {
+                    this.mouseNum = 0;
+                    this.mouseNumTime = 0;
+                } else {
+                    this.mouseNumTime += 1;
+                }
+                if (this.mapBox) {
+                    if (this.mouseNumTime >= 15) {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = 'none';
+                        }
+                    } else {
+                        for (let i = 0; i < this.mapBox.length; i++) {
+                            this.mapBox[i].style.cursor = '';
+                        }
+                    }
+                }
+            }, 1000);
+        },
+        // 设置菜单和工具栏位置
+        setPosition() {
+            this.$nextTick(() => {
+                let offset = 10;
+                const menuBar = document.getElementById('menuBar');
+                const menuTool = document.getElementById('menuTool');
 
-				if (menuBar) {
-					offset += (menuBar.offsetHeight || 0);
-				}
+                if (menuBar) {
+                    offset += (menuBar.offsetHeight || 0);
+                }
 
-				if (menuTool) {
-					offset += (menuTool.offsetHeight || 0);
-				}
+                if (menuTool) {
+                    offset += (menuTool.offsetHeight || 0);
+                }
 
-				if (this.offset != offset) {
-					this.offset = offset;
-				}
-			});
-		},
-		// 结束加载状态
-		endViewLoading(isSuccess) {
-			if (!isSuccess) {
-				this.$store.dispatch('map/mapClear');
-			}
+                if (this.offset != offset) {
+                    this.offset = offset;
+                }
+            });
+        },
+        // 结束加载状态
+        endViewLoading(isSuccess) {
+            if (!isSuccess) {
+                this.$store.dispatch('map/mapClear');
+            }
 
-			this.$nextTick(() => {
-				EventBus.$emit('viewLoading', false);
-			});
-		},
-		// 加载地图数据
-		initLoadData() {
-			const width = document.documentElement.clientWidth;
-			const height = document.documentElement.clientHeight + 200;
-			this.$store.dispatch('config/resize', { width, height });
+            this.$nextTick(() => {
+                EventBus.$emit('viewLoading', false);
+            });
+        },
+        // 加载地图数据
+        initLoadData() {
+            const width = document.documentElement.clientWidth;
+            const height = document.documentElement.clientHeight + 200;
+            this.$store.dispatch('config/resize', { width, height });
 
-			try {
-				this.loadSimulationInfo();
-				this.initLoadDemonData();
-				this.checkLoginLineTimer();
-				this.checkMouseStatusTimer();
-			} catch (error) {
-				this.$messageBox( this.$t('error.initializationFailed') + error.message);
-				this.endViewLoading();
-			}
-		},
-		async loadSimulationInfo() {
-			const resp = await getSimulationInfo(this.group);
-			if (resp && resp.code == 200) {
-				this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
-				this.questId = Number(resp.data.questId) || 0;
-			}
-		},
-		async getUserRole() {
-			const res = await getUserRoles(this.group);
-			this.userRole = res.data.userRole;
-			this.deviceCode = res.data.deviceCode;
-			this.ibpPart = res.data.ibpPart;
-			if (this.userRole === 'IBP') {
-				this.showIbp(this.deviceCode);
-			} else {
-				this.hideIbp();
-			}
-			return res;
-		},
-		// 仿真系统
-		async initLoadDemonData() {
-			this.$store.dispatch('training/end', TrainingMode.NORMAL);
-			this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
+            try {
+                this.loadSimulationInfo();
+                this.initLoadDemonData();
+                this.checkLoginLineTimer();
+                this.checkMouseStatusTimer();
+            } catch (error) {
+                this.$messageBox( this.$t('error.initializationFailed') + error.message);
+                this.endViewLoading();
+            }
+        },
+        async loadSimulationInfo() {
+            const resp = await getSimulationInfo(this.group);
+            if (resp && resp.code == 200) {
+                this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause);
+                this.questId = Number(resp.data.questId) || 0;
+            }
+        },
+        async getUserRole() {
+            const res = await getUserRoles(this.group);
+            this.userRole = res.data.userRole;
+            this.deviceCode = res.data.deviceCode;
+            this.ibpPart = res.data.ibpPart;
+            if (this.userRole === 'IBP') {
+                this.showIbp(this.deviceCode);
+            } else {
+                this.hideIbp();
+            }
+            return res;
+        },
+        // 仿真系统
+        async initLoadDemonData() {
+            this.$store.dispatch('training/end', TrainingMode.NORMAL);
+            this.$store.dispatch('training/changeOperateMode', { mode: OperateMode.NORMAL }); // 默认为正常模式
 
-			if (this.skinCode) {
-				// 01 现地 02 行调 '' 观众
-				const resp = await this.getUserRole();
-				if (resp && resp.code == 200) {
-					// Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 Repair 通号 IBP:IBP盘
-					this.userRole = resp.data.userRole;
-					switch (this.userRole) {
-					case 'Admin': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Admin'); this.hideIbp(); break;
-					case 'Instructor': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Instructor'); this.hideIbp(); break;
-					case 'Dispatcher': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Dispatcher'); this.hideIbp(); break;
-					case 'Attendant': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'Attendant'); this.hideIbp(); break;
-					case 'Audience': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Audience'); this.hideIbp(); break;
-					case 'Driver': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Driver'); this.hideIbp(); break;
-					case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); this.hideIbp(); break;
-					case 'IBP': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'IBP'); this.showIbp(resp.data.deviceCode); break;
-					case 'BigScreen': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'BigScreen'); this.hideIbp(); break;
-					}
-				}
-				await this.getTrainDetail(this.skinCode);
-			} else {
-				this.endViewLoading();
-			}
-		},
-		async getTrainDetail(skinCode) {
-			try {
-				await loadMapData(skinCode);
-				await this.$store.dispatch('training/setMapDefaultState');
-			} catch (error) {
-				this.$messageBox(this.$t('error.getMapDataFailed'));
-				this.endViewLoading();
-			}
-		},
-		back() {
-			this.$refs.demonMenu.back();
-		},
-		runPlanViewShow() {
-			this.$refs.runPlanView.doShow();
-		},
-		runPlanLoadShow() {
-			this.$refs.runPlanLoad.doShow();
-		},
-		faultChooseShow() {
-			this.$refs.faultChoose.doShow();
-		},
-		showdriving() {
-			this.panelShow = true;
-			this.drivingShow = false;
-			this.ibpShow =false;
-		},
-		showIbp(deviceCode) {
-			this.drivingShow = false;
-			this.panelShow = false;
-			this.ibpShow = true;
-			if (!deviceCode || !ibpData[deviceCode]) {
-				Message.warning({message: this.$t('error.ibpNoDraw'), duration: 0, showClose: true, type: 'error'});
-				return;
-			} else {
-				Message.closeAll();
-			}
-			this.$refs.ibpPlate.show(deviceCode, this.ibpPart);
-		},
-		hidepanel() {
-			this.panelShow = false;
-			this.drivingShow = true;
-			this.ibpShow = false;
-			this.$refs.Jl3dDrive.show(this.skinCode);
-		},
-		hideIbp() {
-			Message.closeAll();
-			this.drivingShow = false;
-			this.panelShow = true;
-			this.ibpShow = false;
-			this.$refs.ibpPlate.ibpDestroy();
-		},
-		messageInfo(message, type) {
-			this.$message({
-				showClose: true,
-				message: message,
-				type: type
-			});
-		},
-		setWindowSize() {
-			this.$nextTick(() => {
-				this.$store.dispatch('config/resize', { width: this.width, height: this.height });
-				this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
-			});
-		}
-	}
+            if (this.skinCode) {
+                // 01 现地 02 行调 '' 观众
+                const resp = await this.getUserRole();
+                if (resp && resp.code == 200) {
+                    // Admin 管理员 Instructor 教员 Dispatcher 行调 Attendant 车站 Audience 观众 Driver 司机 Repair 通号 IBP:IBP盘
+                    this.userRole = resp.data.userRole;
+                    switch (this.userRole) {
+                    case 'Admin': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Admin'); this.hideIbp(); break;
+                    case 'Instructor': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Instructor'); this.hideIbp(); break;
+                    case 'Dispatcher': this.$store.dispatch('training/setPrdType', '02'); this.$store.dispatch('training/setRoles', 'Dispatcher'); this.hideIbp(); break;
+                    case 'Attendant': this.$store.dispatch('training/setPrdType', '01'); this.$store.dispatch('training/setRoles', 'Attendant'); this.hideIbp(); break;
+                    case 'Audience': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Audience'); this.hideIbp(); break;
+                    case 'Driver': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Driver'); this.hideIbp(); break;
+                    case 'Repair': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'Repair'); this.hideIbp(); break;
+                    case 'IBP': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'IBP'); this.showIbp(resp.data.deviceCode); break;
+                    case 'BigScreen': this.$store.dispatch('training/setPrdType', ''); this.$store.dispatch('training/setRoles', 'BigScreen'); this.hideIbp(); break;
+                    }
+                }
+                await this.getTrainDetail();
+            } else {
+                this.endViewLoading();
+            }
+        },
+        async getTrainDetail() {
+            try {
+                await loadMapDataById(this.mapId);
+                await this.$store.dispatch('training/setMapDefaultState');
+            } catch (error) {
+                this.$messageBox(this.$t('error.getMapDataFailed'));
+                this.endViewLoading();
+            }
+        },
+        back() {
+            this.$refs.demonMenu.back();
+        },
+        runPlanViewShow() {
+            this.$refs.runPlanView.doShow();
+        },
+        runPlanLoadShow() {
+            this.$refs.runPlanLoad.doShow();
+        },
+        faultChooseShow() {
+            this.$refs.faultChoose.doShow();
+        },
+        showdriving() {
+            this.panelShow = true;
+            this.drivingShow = false;
+            this.ibpShow = false;
+        },
+        showIbp(deviceCode) {
+            this.drivingShow = false;
+            this.panelShow = false;
+            this.ibpShow = true;
+            if (!deviceCode || !ibpData[deviceCode]) {
+                Message.warning({message: this.$t('error.ibpNoDraw'), duration: 0, showClose: true, type: 'error'});
+                return;
+            } else {
+                Message.closeAll();
+            }
+            this.$refs.ibpPlate.show(deviceCode, this.ibpPart);
+        },
+        hidepanel() {
+            this.panelShow = false;
+            this.drivingShow = true;
+            this.ibpShow = false;
+            this.$refs.Jl3dDrive.show(this.skinCode);
+        },
+        hideIbp() {
+            Message.closeAll();
+            this.drivingShow = false;
+            this.panelShow = true;
+            this.ibpShow = false;
+            this.$refs.ibpPlate.ibpDestroy();
+        },
+        messageInfo(message, type) {
+            this.$message({
+                showClose: true,
+                message: message,
+                type: type
+            });
+        },
+        setWindowSize() {
+            this.$nextTick(() => {
+                this.$store.dispatch('config/resize', { width: this.width, height: this.height });
+                this.$store.dispatch('training/updateOffsetStationCode', { offsetStationCode: this.offsetStationCode });
+            });
+        }
+    }
 };
 </script>
 <style>
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 0c160e883..e4d87c974 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -26,589 +26,587 @@
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
 import { getStationListBySkinCode, queryRunPlan } from '@/api/runplan';
-import {getRpDetailByUserMapId,getUserMapDetailByMapId} from '@/api/designPlatform';
-import { loadMapData } from '@/utils/loaddata';
+import {getRpDetailByUserMapId, getUserMapDetailByMapId} from '@/api/designPlatform';
+import { loadMapDataById } from '@/utils/loaddata';
 import { getPublishMapInfo } from '@/api/jmap/map';
 import DataTable from './menus/components/dataTable';
 
 export default {
-	name: 'PlanSchedule',
-	components: {
-		DataTable
-	},
-	props: {
-		skinCode: {
-			type: String,
-			required: true
-		},
-		// planConvert: {
-		// 	type: Object,
-		// 	required: true
-		// },
-		maxWidth: {
-			type: Number,
-			required: true
-		},
-		maxHeight: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			planConvert: null,
-			top: 0,
-			height: 0,
-			mapName: '',
-			runPlanId: 'plan-tool',
-			myChart: null,
-			showTrain: false,
-			serviceNumberConfig: {
-				data: [],
-				title: this.$t('planMonitor.serviceNumber'),
-				showHeader: false,
-				highlightCurrentRow: true,
-				handleChange: this.serviceNumberChange,
-				showClose: false,
-				columns: [
-					{
-						prop: 'serviceNumber',
-						label: this.$t('planMonitor.serviceNumber')
-					}
-				]
-			},
-			tripNumberConfig: {
-				data: [],
-				title: this.$t('planMonitor.tripNumber'),
-				showHeader: false,
-				highlightCurrentRow: true,
-				handleChange: this.tripNumberChange,
-				showClose: false,
-				columns: [
-					{
-						prop: 'tripNumber',
-						label: this.$t('planMonitor.tripNumber')
-					}
-				]
-			},
-			realData: {},
-			kmRangeCoordMap: {},
-			option: {
-				title: { // 标题
-					text: '',
-					left: 'center', // 居中对齐
-					top: '10px'
-				},
-				grid: { // 整个坐标系位置
-					top: '50px',
-					left: '120px',
-					right: '80px',
-					bottom: '60px',
-					containLabel: true,
-					backgroundColor: 'floralwhite'
-				},
-				toolbox: { // 工具栏
-					top: '10px',
-					right: '120px',
-					feature: {
-						dataZoom: {
-							yAxisIndex: 'none'
-						},
-						restore: {},
-						saveAsImage: {}
-					}
-				},
-				tooltip: {
-					trigger: 'axis',
-					axisPointer: {
-						// trigger: 'item',
-						type: 'cross',
-						snap: true,
-						axis: 'x'
-					},
-					formatter: this.axisTooltip,
-					borderWidth: 1,
-					position: function (pt) {
-						const data = pt[0] + 10;
-						return [data, '20%'];
-					}
-				},
-				xAxis: [
-					{
-						type: 'category',
-						boundaryGap: false,
-						data: [],
-						axisLine: {
-							onZero: false,
-							lineStyle: {
-								width: 1
-								// color: '#d14a61'
-							}
-						},
-						axisLabel: {
-							formatter: this.xAxisLableFormat,
-							textStyle: {
-								color: '#333'
-							}
-						},
-						axisPointer: {
-							snap: true,
-							label: {
-								formatter: this.xAxisPointFormat,
-								backgroundColor: 'rgb(255,0,0,0.5)',
-								color: 'white'
-							}
-						}
-					}
-				],
-				yAxis: {
-					type: 'value',
-					splitLine: {
-						show: false
-					},
-					axisTick: {
-						show: false
-					},
-					axisLine: {
-						onZero: false,
-						lineStyle: {
-							width: 1
-							// color: '#d14a61'
-						}
-					},
-					axisLabel: {
-						interval: 'auto',
-						formatter: this.yAxisLableFormat
-					},
-					axisPointer: {
-						xAxisIndex: 'all',
-						label: {
-							formatter: this.yAxisPointFormat,
-							backgroundColor: 'rgb(0,100,0,0.5)',
-							color: 'white'
-						}
-					},
-					min: 0,
-					max: 0
-				},
-				series: [],
-				dataZoom: [ // 滑动滚轮
-					{
-						type: 'inside'
-					},
-					{
-						fiterMode: 'filter',
-						handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-						handleSize: '80%',
-						handleStyle: {
-							color: '#fff',
-							shadowBlur: 3,
-							shadowColor: 'rgba(0, 0, 0, 0.6)',
-							shadowOffsetX: 2,
-							shadowOffsetY: 2
-						},
-						bottom: '20px'
-					}
-				]
-			},
-			absoluteTime: 2 * 3600,
-			indexKmRangeMap: {}
-		};
-	},
-	computed: {
-		...mapGetters('runPlan', [
-			'stations'
-		]),
-		planId() {
-			return this.$route.query.planId;
-		}
-	},
-	watch: {
-		maxWidth() {
-			this.setPosition();
-		},
-		maxHeight() {
-			this.setPosition();
-		},
-		'$store.state.runPlan.planSizeCount': function () {
-			this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-		},
-		'$store.state.runPlan.refreshCount': function() {
-			this.loadChartPage();
-		},
-		$route() {
-			this.$nextTick(() => {
-				this.loadChartPage();
-			});
-		}
-	},
-	mounted() {
-		this.setPosition();
-		this.loadChartPage();
-	},
-	beforeDestroy() {
-		this.destroy();
-	},
-	methods: {
-		displayTrain() {
-			this.showTrain = !this.showTrain;
-		},
-		serviceNumberChange(row) {
-			let serviceNumber = null;
-			let serviceObj = {};
-			if (row) {
-				serviceNumber = row.serviceNumber;
-				serviceObj = this.$store.state.runPlan.editData[row.serviceNumber] || {};
+    name: 'PlanSchedule',
+    components: {
+        DataTable
+    },
+    props: {
+        skinCode: {
+            type: String,
+            required: true
+        },
+        // planConvert: {
+        // 	type: Object,
+        // 	required: true
+        // },
+        maxWidth: {
+            type: Number,
+            required: true
+        },
+        maxHeight: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            planConvert: null,
+            top: 0,
+            height: 0,
+            mapName: '',
+            runPlanId: 'plan-tool',
+            myChart: null,
+            showTrain: false,
+            serviceNumberConfig: {
+                data: [],
+                title: this.$t('planMonitor.serviceNumber'),
+                showHeader: false,
+                highlightCurrentRow: true,
+                handleChange: this.serviceNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'serviceNumber',
+                        label: this.$t('planMonitor.serviceNumber')
+                    }
+                ]
+            },
+            tripNumberConfig: {
+                data: [],
+                title: this.$t('planMonitor.tripNumber'),
+                showHeader: false,
+                highlightCurrentRow: true,
+                handleChange: this.tripNumberChange,
+                showClose: false,
+                columns: [
+                    {
+                        prop: 'tripNumber',
+                        label: this.$t('planMonitor.tripNumber')
+                    }
+                ]
+            },
+            realData: {},
+            kmRangeCoordMap: {},
+            option: {
+                title: { // 标题
+                    text: '',
+                    left: 'center', // 居中对齐
+                    top: '10px'
+                },
+                grid: { // 整个坐标系位置
+                    top: '50px',
+                    left: '120px',
+                    right: '80px',
+                    bottom: '60px',
+                    containLabel: true,
+                    backgroundColor: 'floralwhite'
+                },
+                toolbox: { // 工具栏
+                    top: '10px',
+                    right: '120px',
+                    feature: {
+                        dataZoom: {
+                            yAxisIndex: 'none'
+                        },
+                        restore: {},
+                        saveAsImage: {}
+                    }
+                },
+                tooltip: {
+                    trigger: 'axis',
+                    axisPointer: {
+                        // trigger: 'item',
+                        type: 'cross',
+                        snap: true,
+                        axis: 'x'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1,
+                    position: function (pt) {
+                        const data = pt[0] + 10;
+                        return [data, '20%'];
+                    }
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 1
+                                // color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: {
+                    type: 'value',
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 1
+                            // color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        interval: 'auto',
+                        formatter: this.yAxisLableFormat
+                    },
+                    axisPointer: {
+                        xAxisIndex: 'all',
+                        label: {
+                            formatter: this.yAxisPointFormat,
+                            backgroundColor: 'rgb(0,100,0,0.5)',
+                            color: 'white'
+                        }
+                    },
+                    min: 0,
+                    max: 0
+                },
+                series: [],
+                dataZoom: [ // 滑动滚轮
+                    {
+                        type: 'inside'
+                    },
+                    {
+                        fiterMode: 'filter',
+                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                        handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+                        },
+                        bottom: '20px'
+                    }
+                ]
+            },
+            absoluteTime: 2 * 3600,
+            indexKmRangeMap: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        planId() {
+            return this.$route.query.planId;
+        }
+    },
+    watch: {
+        maxWidth() {
+            this.setPosition();
+        },
+        maxHeight() {
+            this.setPosition();
+        },
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.runPlan.refreshCount': function() {
+            this.loadChartPage();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.loadChartPage();
+            });
+        }
+    },
+    mounted() {
+        this.setPosition();
+        this.loadChartPage();
+    },
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+        displayTrain() {
+            this.showTrain = !this.showTrain;
+        },
+        serviceNumberChange(row) {
+            let serviceNumber = null;
+            let serviceObj = {};
+            if (row) {
+                serviceNumber = row.serviceNumber;
+                serviceObj = this.$store.state.runPlan.editData[row.serviceNumber] || {};
 
-				const op = this.myChart.getOption();
-				op.series.forEach((item, index) => {
-					item.lineStyle.color = '#000';
-					if (item.name == serviceNumber) {
-						item.lineStyle.color = 'red';
-					}
-					if (item.name == 'trainLabel') {
-						item.data = [];
-					}
-				});
-				this.myChart.setOption(op);
-			}
-			this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null });
-			this.analyticalTripNumber(serviceObj.trainMap || {});
-		},
-		tripNumberChange(row) {
-			const serviceNumber = this.$store.state.runPlan.selected.serviceNumber;
-			let tripNumber = null;
-			if (row) {
-				const data = [];
-				tripNumber = row.tripNumber;
-				const op = this.myChart.getOption();
-				op.series.forEach(item => {
-					if (item.name == serviceNumber) {
-						item.data.forEach(nor => {
-							if (nor[3] == tripNumber) {
-								data.push(nor);
-							}
-						});
-					}
-					if (item.name == 'trainLabel') {
-						item.data = [];
-					}
-				});
-				op.series.push({
-					name: 'trainLabel',
-					lineStyle: {
-						color: 'green'
-					},
-					type: 'line',
-					data: data
-				});
-				this.myChart && this.myChart.setOption(op);
-			}
+                const op = this.myChart.getOption();
+                op.series.forEach((item, index) => {
+                    item.lineStyle.color = '#000';
+                    if (item.name == serviceNumber) {
+                        item.lineStyle.color = 'red';
+                    }
+                    if (item.name == 'trainLabel') {
+                        item.data = [];
+                    }
+                });
+                this.myChart.setOption(op);
+            }
+            this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: null });
+            this.analyticalTripNumber(serviceObj.trainMap || {});
+        },
+        tripNumberChange(row) {
+            const serviceNumber = this.$store.state.runPlan.selected.serviceNumber;
+            let tripNumber = null;
+            if (row) {
+                const data = [];
+                tripNumber = row.tripNumber;
+                const op = this.myChart.getOption();
+                op.series.forEach(item => {
+                    if (item.name == serviceNumber) {
+                        item.data.forEach(nor => {
+                            if (nor[3] == tripNumber) {
+                                data.push(nor);
+                            }
+                        });
+                    }
+                    if (item.name == 'trainLabel') {
+                        item.data = [];
+                    }
+                });
+                op.series.push({
+                    name: 'trainLabel',
+                    lineStyle: {
+                        color: 'green'
+                    },
+                    type: 'line',
+                    data: data
+                });
+                this.myChart && this.myChart.setOption(op);
+            }
 
-			this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
-		},
-		async analyticalServiceNumber(data) {
-			this.serviceNumberConfig.data = Object.keys(data || {})
-				.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-				.map(serviceNumber => { return { serviceNumber }; });
-		},
-		async analyticalTripNumber(data) {
-			this.tripNumberConfig.data = Object.keys(data || {})
-				.sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
-				.map(tripNumber => { return { tripNumber }; });
-		},
-		async setPosition() {
-			this.$nextTick(() => {
-				let top = 3;
-				const width = this.maxWidth;
-				let height = this.maxHeight;
+            this.$store.dispatch('runPlan/setSelected', { serviceNumber: serviceNumber, tripNumber: tripNumber });
+        },
+        async analyticalServiceNumber(data) {
+            this.serviceNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .map(serviceNumber => { return { serviceNumber }; });
+        },
+        async analyticalTripNumber(data) {
+            this.tripNumberConfig.data = Object.keys(data || {})
+                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .map(tripNumber => { return { tripNumber }; });
+        },
+        async setPosition() {
+            this.$nextTick(() => {
+                let top = 3;
+                const width = this.maxWidth;
+                let height = this.maxHeight;
 
-				const titleBar = document.getElementById('PlanTitleBar');
-				const menuBar = document.getElementById('PlanMenuBar');
-				const menuTool = document.getElementById('PlanMenuTool');
-				const statusBar = document.getElementById('PlanStatusBar');
+                const titleBar = document.getElementById('PlanTitleBar');
+                const menuBar = document.getElementById('PlanMenuBar');
+                const menuTool = document.getElementById('PlanMenuTool');
+                const statusBar = document.getElementById('PlanStatusBar');
 
-				if (titleBar) {
-					top += (titleBar.offsetHeight || 0);
-				}
+                if (titleBar) {
+                    top += (titleBar.offsetHeight || 0);
+                }
 
-				if (menuBar) {
-					top += (menuBar.offsetHeight || 0);
-				}
+                if (menuBar) {
+                    top += (menuBar.offsetHeight || 0);
+                }
 
-				if (menuTool) {
-					top += (menuTool.offsetHeight || 0);
-				}
+                if (menuTool) {
+                    top += (menuTool.offsetHeight || 0);
+                }
 
-				if (statusBar) {
-					height -= (statusBar.offsetHeight || 0);
-				}
+                if (statusBar) {
+                    height -= (statusBar.offsetHeight || 0);
+                }
 
-				height = height - top;
-				this.$store.dispatch('runPlan/resize', { width, height });
+                height = height - top;
+                this.$store.dispatch('runPlan/resize', { width, height });
 
-				if (this.top != top) {
-					this.top = top;
-				}
+                if (this.top != top) {
+                    this.top = top;
+                }
 
-				if (this.height != height) {
-					this.height = height - 20 * 2;
-				}
-			});
-		},
-		async loadChartPage() {
-			try {
-				if(/^\/plan\/usertool/.test(this.$route.fullPath)){
-					getUserMapDetailByMapId(this.$route.query.mapId).then(resp => {
-						this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
-					});
-				}
-				else{
-					getPublishMapInfo(this.$route.query.mapId).then(resp => {
-						this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
-					});
-				}
-				this.planConvert = this.$theme.loadPlanConvert(this.skinCode);
-				this.$store.dispatch('runPlan/clear').then(() => {
-					this.loadInitChart().then(() => {
-						if (this.skinCode) {
-							loadMapData(this.skinCode);
-							getStationListBySkinCode(this.$route.query.skinCode).then(resp => {
-								this.$store.dispatch('runPlan/setStations', resp.data).then(() => {
-									this.loadInitData();
-									if (this.planId) {
-										this.myChart && this.myChart.showLoading();
+                if (this.height != height) {
+                    this.height = height - 20 * 2;
+                }
+            });
+        },
+        async loadChartPage() {
+            try {
+                if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+                    getUserMapDetailByMapId(this.$route.query.mapId).then(resp => {
+                        this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
+                    });
+                } else {
+                    getPublishMapInfo(this.$route.query.mapId).then(resp => {
+                        this.mapName = `${resp.data.name} (${this.$route.query.planName || ''})`;
+                    });
+                }
+                this.planConvert = this.$theme.loadPlanConvert(this.skinCode);
+                this.$store.dispatch('runPlan/clear').then(() => {
+                    this.loadInitChart().then(() => {
+                        if (this.$route.query.mapId) {
+                            loadMapDataById(this.$route.query.mapId);
+                            getStationListBySkinCode(this.$route.query.skinCode).then(resp => {
+                                this.$store.dispatch('runPlan/setStations', resp.data).then(() => {
+                                    this.loadInitData();
+                                    if (this.planId) {
+                                        this.myChart && this.myChart.showLoading();
 
-										if(/^\/plan\/usertool/.test(this.$route.fullPath)){
-											getRpDetailByUserMapId(this.planId).then(rest => {
-												this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
-													this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-													this.loadChartData();
-													this.myChart && this.myChart.hideLoading();
-												});
-											}).catch(() => {
-												this.myChart && this.myChart.hideLoading();
-												this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-											});
-										}else{
-											queryRunPlan(this.planId).then(rest => {
-												this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
-													this.analyticalServiceNumber(this.$store.state.runPlan.editData);
-													this.loadChartData();
-													this.myChart && this.myChart.hideLoading();
-												});
-											}).catch(() => {
-												this.myChart && this.myChart.hideLoading();
-												this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-											});
-										}
-										
+                                        if (/^\/plan\/usertool/.test(this.$route.fullPath)) {
+                                            getRpDetailByUserMapId(this.planId).then(rest => {
+                                                this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+                                                    this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                                                    this.loadChartData();
+                                                    this.myChart && this.myChart.hideLoading();
+                                                });
+                                            }).catch(() => {
+                                                this.myChart && this.myChart.hideLoading();
+                                                this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                                            });
+                                        } else {
+                                            queryRunPlan(this.planId).then(rest => {
+                                                this.$store.dispatch('runPlan/setPlanData', rest.data).then(() => {
+                                                    this.analyticalServiceNumber(this.$store.state.runPlan.editData);
+                                                    this.loadChartData();
+                                                    this.myChart && this.myChart.hideLoading();
+                                                });
+                                            }).catch(() => {
+                                                this.myChart && this.myChart.hideLoading();
+                                                this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                                            });
+                                        }
 
-									} else {
-										this.clearCanvas();
-									}
-								});
-							}).catch(() => {
-								this.$messageBox(this.$t('tip.requestingStationDataFailed'));
-								this.$store.dispatch('runPlan/setStations', []);
-							});
-						}
-					});
-				});
-			} catch (error) {
-				this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-			}
-		},
-		async loadChartData() {
-			try {
-				const stations = this.$store.state.runPlan.stations;
-				const planData = this.$store.state.runPlan.planData;
+                                    } else {
+                                        this.clearCanvas();
+                                    }
+                                });
+                            }).catch(() => {
+                                this.$messageBox(this.$t('tip.requestingStationDataFailed'));
+                                this.$store.dispatch('runPlan/setStations', []);
+                            });
+                        }
+                    });
+                });
+            } catch (error) {
+                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
+            }
+        },
+        async loadChartData() {
+            try {
+                const stations = this.$store.state.runPlan.stations;
+                const planData = this.$store.state.runPlan.planData;
 
-				this.viewDisabled = true;
+                this.viewDisabled = true;
 
-				this.option.series = [];
-				this.kmRangeCoordMap = this.planConvert.convertStationsToMap(stations);
-				this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]);
-				this.pushModels(this.option.series, this.planConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5, color: '#000' }));
-				await this.loadInitChart();
+                this.option.series = [];
+                this.kmRangeCoordMap = this.planConvert.convertStationsToMap(stations);
+                this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]);
+                this.pushModels(this.option.series, this.planConvert.convertDataToModels(planData, stations, this.kmRangeCoordMap, { width: 0.5, color: '#000' }));
+                await this.loadInitChart();
 
-				this.viewDisabled = false;
-			} catch (error) {
-				this.viewDisabled = false;
-				this.$messageBox(this.$t('error.loadingOperationGraphFailed')+this.$t('global.colon')+error.message);
-			}
-		},
-		async loadInitData() {
-			await this.xAxisInit();
-			await this.yAxisInit();
-			await this.loadInitChart();
-		},
-		pushModels(series, models) {
-			if (models && models.length) {
-				models.forEach(elem => {
-					if (elem) {
-						series.push(elem);
-					}
-				});
-			}
+                this.viewDisabled = false;
+            } catch (error) {
+                this.viewDisabled = false;
+                this.$messageBox(this.$t('error.loadingOperationGraphFailed') + this.$t('global.colon') + error.message);
+            }
+        },
+        async loadInitData() {
+            await this.xAxisInit();
+            await this.yAxisInit();
+            await this.loadInitChart();
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
 
-			return series;
-		},
-		popModels(series, models) {
-			if (models && models.length) {
-				models.forEach(elem => {
-					const index = series.indexOf(elem);
-					if (index >= 0) {
-						series.split(index, 1);
-					}
-				});
-			}
+            return series;
+        },
+        popModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    const index = series.indexOf(elem);
+                    if (index >= 0) {
+                        series.split(index, 1);
+                    }
+                });
+            }
 
-			return series;
-		},
-		loadInitChart() {
-			return new Promise((resolve, reject) => {
-				try {
-					const that = this;
-					// 加载echart配置
-					require.config(
-						{
-							paths: {
-								echarts: './js/dist'
-							}
-						}
-					);
-					// 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
-					require(
-						[
-							'echarts',
-							'echarts/lib/chart/line'
-						],
-						function (ec) {
-							if (that.myChart && that.myChart.isDisposed) {
-								that.myChart.clear();
-							}
-							if (that.$route.query.planName) {
-								that.option.title.text = that.mapName;
-							}
-							that.myChart = ec.init(document.getElementById(that.runPlanId));
-							that.myChart.setOption(that.option);
-							that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
-							// that.myChart.on('click', that.mouseClick);
-							resolve(true);
-						}
-					);
-				} catch (error) {
-					reject(error);
-				}
-			});
-		},
-		clearCanvas() {
-			this.option.series = [];
-			this.option.title.text = '';
-			if (this.myChart) {
-				this.myChart.clear();
-			}
-			this.myChart.setOption(this.option);
-		},
-		xAxisPointFormat(params) {
-			return timeFormat(params.value);
-		},
-		yAxisPointFormat(params) {
-			return this.planConvert.computedFormatYAxis(this.stations, params);
-		},
-		xAxisLableFormat(value, index) {
-			if (value % 60 === 0) {
-				return timeFormat(value);
-			}
-		},
-		yAxisLableFormat(value, index) {
-			return '';
-		},
-		xAxisInit() {
-			const list = [];
-			for (var time = 0 + this.planConvert.TranslationTime; time < 3600 * 24 + this.planConvert.TranslationTime; time++) {
-				list.push(time);
-			}
+            return series;
+        },
+        loadInitChart() {
+            return new Promise((resolve, reject) => {
+                try {
+                    const that = this;
+                    // 加载echart配置
+                    require.config(
+                        {
+                            paths: {
+                                echarts: './js/dist'
+                            }
+                        }
+                    );
+                    // 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
+                    require(
+                        [
+                            'echarts',
+                            'echarts/lib/chart/line'
+                        ],
+                        function (ec) {
+                            if (that.myChart && that.myChart.isDisposed) {
+                                that.myChart.clear();
+                            }
+                            if (that.$route.query.planName) {
+                                that.option.title.text = that.mapName;
+                            }
+                            that.myChart = ec.init(document.getElementById(that.runPlanId));
+                            that.myChart.setOption(that.option);
+                            that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
+                            // that.myChart.on('click', that.mouseClick);
+                            resolve(true);
+                        }
+                    );
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        clearCanvas() {
+            this.option.series = [];
+            this.option.title.text = '';
+            if (this.myChart) {
+                this.myChart.clear();
+            }
+            this.myChart.setOption(this.option);
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.planConvert.computedFormatYAxis(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            if (value % 60 === 0) {
+                return timeFormat(value);
+            }
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit() {
+            const list = [];
+            for (var time = 0 + this.planConvert.TranslationTime; time < 3600 * 24 + this.planConvert.TranslationTime; time++) {
+                list.push(time);
+            }
 
-			const startValue = 3600 * 6;
-			const offsetTime = 3600 * 1;
+            const startValue = 3600 * 6;
+            const offsetTime = 3600 * 1;
 
-			this.option.xAxis[0].data = list;
-			if (!this.option.dataZoom[0].startValue) {
-				this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
-			}
+            this.option.xAxis[0].data = list;
+            if (!this.option.dataZoom[0].startValue) {
+                this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = startValue - offsetTime;
+            }
 
-			if (!this.option.dataZoom[0].endValue) {
-				this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
-			}
-		},
-		yAxisInit() {
-			if (Object.keys(this.planConvert).length) {
-				this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]);
-				this.option.yAxis.min = this.planConvert.computedYaxisMinValue(this.stations);
-				this.option.yAxis.max = this.planConvert.computedYaxisMaxValue(this.stations);
-			}
-		},
-		axisTooltip(param) {
-			let data = '';
-			const arr = [];
-			param.forEach(item => {
-				const station = this.stations[Math.floor((item.data[1] - this.planConvert.EdgeHeight) / this.planConvert.CoordMultiple)] || { name: '', kmRange: '' };
-				if (!arr.includes(`${item.data[0]}${item.data[1]}`)) {
-					arr.push(`${item.data[0]}${item.data[1]}`);
-					const list = [
-						`${this.$t('planMonitor.stationName')}${station.name}<br>`,
-						`${this.$t('planMonitor.stationKilometerMark')}${station.kmRange} km <br>`,
-						`${this.$t('planMonitor.arriveTime')}${timeFormat(item.data[0] + this.planConvert.TranslationTime)}<br>`,
-						`${this.$t('planMonitor.serverTrainNum')}: ${item.seriesName}${item.data[3]}(${item.data[3][0] == '2' ? '上行' : '下行'})`,
-						`<hr size=1 style="margin: 3px 0">`
-					];
-					data += list.join('');
-				}
-			});
-			return data;
-		},
-		// mouseClick(params) {
-		// 	const model = {
-		// 		serviceNumber: params.seriesName
-		// 	};
+            if (!this.option.dataZoom[0].endValue) {
+                this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = startValue + offsetTime;
+            }
+        },
+        yAxisInit() {
+            if (Object.keys(this.planConvert).length) {
+                this.pushModels(this.option.series, [this.planConvert.initializeYaxis(this.stations)]);
+                this.option.yAxis.min = this.planConvert.computedYaxisMinValue(this.stations);
+                this.option.yAxis.max = this.planConvert.computedYaxisMaxValue(this.stations);
+            }
+        },
+        axisTooltip(param) {
+            let data = '';
+            const arr = [];
+            param.forEach(item => {
+                const station = this.stations[Math.floor((item.data[1] - this.planConvert.EdgeHeight) / this.planConvert.CoordMultiple)] || { name: '', kmRange: '' };
+                if (!arr.includes(`${item.data[0]}${item.data[1]}`)) {
+                    arr.push(`${item.data[0]}${item.data[1]}`);
+                    const list = [
+                        `${this.$t('planMonitor.stationName')}${station.name}<br>`,
+                        `${this.$t('planMonitor.stationKilometerMark')}${station.kmRange} km <br>`,
+                        `${this.$t('planMonitor.arriveTime')}${timeFormat(item.data[0] + this.planConvert.TranslationTime)}<br>`,
+                        `${this.$t('planMonitor.serverTrainNum')}: ${item.seriesName}${item.data[3]}(${item.data[3][0] == '2' ? '上行' : '下行'})`,
+                        `<hr size=1 style="margin: 3px 0">`
+                    ];
+                    data += list.join('');
+                }
+            });
+            return data;
+        },
+        // mouseClick(params) {
+        // 	const model = {
+        // 		serviceNumber: params.seriesName
+        // 	};
 
-		// 	const op = this.myChart.getOption();
-		// 	op.series.forEach(item => {
-		// 		item.lineStyle.color = '#000';
-		// 		if (item.name == params.seriesName) {
-		// 			item.lineStyle.color = 'red';
-		// 		}
-		// 		if (item.name == 'trainLabel') {
-		// 			item.data = [];
-		// 		}
-		// 	});
-		// 	this.myChart.setOption(op);
-		// 	this.$store.dispatch('runPlan/setSelected', model);
-		// },
-		reSize(opt) {
-			if (this.myChart) {
-				this.myChart.resize({
-					width: opt.width,
-					height: opt.height,
-					silent: false
-				});
-			}
-		},
-		destroy() {
-			if (this.myChart && this.myChart.isDisposed) {
-				this.myChart.dispose();
-				this.myChart = null;
-			}
-		},
-		scheduleTouch() {
+        // 	const op = this.myChart.getOption();
+        // 	op.series.forEach(item => {
+        // 		item.lineStyle.color = '#000';
+        // 		if (item.name == params.seriesName) {
+        // 			item.lineStyle.color = 'red';
+        // 		}
+        // 		if (item.name == 'trainLabel') {
+        // 			item.data = [];
+        // 		}
+        // 	});
+        // 	this.myChart.setOption(op);
+        // 	this.$store.dispatch('runPlan/setSelected', model);
+        // },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        scheduleTouch() {
 
-		},
-		trainNumTouch() {
+        },
+        trainNumTouch() {
 
-		}
-	}
+        }
+    }
 };
 </script>
 <style scoped rel="stylesheet/scss" lang="scss">

From 375773cceb9189cc082356d6b45f2cc3e6e6b4ca Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 13:56:43 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/map/skin/{skinCode}/version;/api/map/skin/{skinCo?=
 =?UTF-8?q?de}/details?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                      |   6 -
 src/utils/baseUrl.js                     |   4 +-
 src/views/display/index.vue              |   1 -
 src/views/display/menuExam.vue           | 248 +++++++--------
 src/views/display/tipExamList.vue        | 385 ++++++++++++-----------
 src/views/exam/detail/courseDetail.vue   | 286 ++++++++---------
 src/views/exam/detail/examDetail.vue     | 313 +++++++++---------
 src/views/exam/detail/questionDetail.vue | 154 ++++-----
 src/views/teach/detail/index.vue         | 298 +++++++++---------
 src/views/teach/practical/index.vue      | 131 --------
 10 files changed, 845 insertions(+), 981 deletions(-)
 delete mode 100644 src/views/teach/practical/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 7e5cc03b5..a5fa8d4e4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,7 +42,6 @@ import ScriptmanageHome from '@/views/scriptManage/home';
 import ScriptDisplay from '@/views/scriptManage/display/index';
 
 import TeachDetail from '@/views/teach/detail/index';
-import TeachPractical from '@/views/teach/practical/index';
 import TeachHome from '@/views/teach/index';
 import Pay from '@/views/components/pay/index';
 import ExamDetail from '@/views/exam/detail/examDetail';
@@ -602,11 +601,6 @@ export const asyncRouter = [
                         component: ExamDetail,
                         hidden: true
                     },
-                    {
-                        path: 'practical/:trainingId/:lessonId',
-                        component: TeachPractical,
-                        hidden: true
-                    },
                     {
                         path: 'pay/:lessonId',
                         component: Pay,
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 343289067..cbc51f6c4 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,10 +3,10 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        // BASE_API = 'https://test.joylink.club/jlcloud';
+        BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
         // BASE_API = 'http://192.168.3.6:9000'; // 旭强
-        BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
+        // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
     }
diff --git a/src/views/display/index.vue b/src/views/display/index.vue
index 1178bcef7..3c797ee6a 100644
--- a/src/views/display/index.vue
+++ b/src/views/display/index.vue
@@ -237,7 +237,6 @@ export default {
         $route() {
             this.$nextTick(() => {
                 this.initLoadData();
-                console.log(1111);
             });
         }
     },
diff --git a/src/views/display/menuExam.vue b/src/views/display/menuExam.vue
index 51dfcf9c6..231c0da0a 100644
--- a/src/views/display/menuExam.vue
+++ b/src/views/display/menuExam.vue
@@ -27,132 +27,132 @@ import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'MenuExam',
-	components: {
-		TipExamList
-	},
-	props: {
-		group: {
-			type: String,
-			required: true
-		},
-		offset: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			isDisable: false,
-			startLoading: false,
-			training: {
-				id: '',
-				name: '',
-				remarks: ''
-			}
-		};
-	},
-	computed: {
-		formatUsedTime() {
-			return timeFormat(this.$store.state.training.usedTime);
-		}
-	},
-	watch: {
-		'$store.state.map.mapViewLoadedCount': function() {
-			this.$store.dispatch('exam/countUsedTime');
-		}
-	},
-	methods: {
-		tipInfo(opt) {
-			if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
-				const h = this.$createElement;
-				this.$notify({
-					title: this.$t('global.tips'),
-					message: h('i', { style: 'color:' + opt.color }, this.$t('display.exam.startTestOperateTip'))
-				});
-			}
-		},
-		start() {
-			this.$store.dispatch('menuOperation/setButtonOperation', null);
-			this.startLoading = true;
-			if (this.$route.query.trainingId) {
-				this.isDisable = true;
-				startTraining({ id: this.$route.query.trainingId }, this.group).then(response => {
-					this.$store.dispatch('training/examModeStart');
-					this.$store.dispatch('map/clearJlmapTrainView').then(() => {
-						this.$store.dispatch('training/setMapDefaultState').then(() => {
-							this.$store.dispatch('training/emitTipFresh');
-						});
-					});
-					this.startLoading = false;
-				}).catch(() => {
-					this.isDisable = false;
-					this.startLoading = false;
-				});
-			} else {
-				this.startLoading = true;
-				this.$messageBox(this.$t('display.exam.selectTest'));
-			}
-		},
-		end() {
-			if (this.$route.query.trainingId) {
-				this.isDisable = false;
-				if (this.$store.state.training.started) {
-					const model = {
-						id: this.$route.query.examQuestionId,
-						usedTime: this.$store.state.training.usedTime,
-						group: this.group
-					};
+    name: 'MenuExam',
+    components: {
+        TipExamList
+    },
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offset: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            isDisable: false,
+            startLoading: false,
+            training: {
+                id: '',
+                name: '',
+                remarks: ''
+            }
+        };
+    },
+    computed: {
+        formatUsedTime() {
+            return timeFormat(this.$store.state.training.usedTime);
+        }
+    },
+    watch: {
+        '$store.state.map.mapViewLoadedCount': function() {
+            this.$store.dispatch('exam/countUsedTime');
+        }
+    },
+    methods: {
+        tipInfo(opt) {
+            if (opt && opt.hasOwnProperty('color') && opt.hasOwnProperty('message')) {
+                const h = this.$createElement;
+                this.$notify({
+                    title: this.$t('global.tips'),
+                    message: h('i', { style: 'color:' + opt.color }, this.$t('display.exam.startTestOperateTip'))
+                });
+            }
+        },
+        start() {
+            this.$store.dispatch('menuOperation/setButtonOperation', null);
+            this.startLoading = true;
+            if (this.$route.query.trainingId) {
+                this.isDisable = true;
+                startTraining({ id: this.$route.query.trainingId }, this.group).then(response => {
+                    this.$store.dispatch('training/examModeStart');
+                    this.$store.dispatch('map/clearJlmapTrainView').then(() => {
+                        this.$store.dispatch('training/setMapDefaultState').then(() => {
+                            this.$store.dispatch('training/emitTipFresh');
+                        });
+                    });
+                    this.startLoading = false;
+                }).catch(() => {
+                    this.isDisable = false;
+                    this.startLoading = false;
+                });
+            } else {
+                this.startLoading = true;
+                this.$messageBox(this.$t('display.exam.selectTest'));
+            }
+        },
+        end() {
+            if (this.$route.query.trainingId) {
+                this.isDisable = false;
+                if (this.$store.state.training.started) {
+                    const model = {
+                        id: this.$route.query.examQuestionId,
+                        usedTime: this.$store.state.training.usedTime,
+                        group: this.group
+                    };
 
-					this.$store.dispatch('training/end', null);
-					finishOneExamQuestion(model).then(response => {
-						this.$store.dispatch('training/emitTipFresh');
-						this.init();
-					}).catch(() => {
-						this.$store.dispatch('training/emitTipFresh');
-						this.$messageBox(this.$t('display.exam.endTrainingError'));
-					});
-				} else {
-					this.isDisable = true;
-					this.$messageBox(this.$t('display.exam.startTestTip'));
-				}
-			}
-		},
-		back() {
-			this.$confirm(this.$t('display.exam.endTestTip'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				this.$emit('quit');
-				this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${this.$route.query.examId}`, query: { subSystem: this.$route.query.subSystem }});
-				Notification.closeAll();
-				exitFullscreen();
-			}).catch(() => {
+                    this.$store.dispatch('training/end', null);
+                    finishOneExamQuestion(model).then(response => {
+                        this.$store.dispatch('training/emitTipFresh');
+                        this.init();
+                    }).catch(() => {
+                        this.$store.dispatch('training/emitTipFresh');
+                        this.$messageBox(this.$t('display.exam.endTrainingError'));
+                    });
+                } else {
+                    this.isDisable = true;
+                    this.$messageBox(this.$t('display.exam.startTestTip'));
+                }
+            }
+        },
+        back() {
+            this.$confirm(this.$t('display.exam.endTestTip'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                this.$emit('quit');
+                this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${this.$route.query.examId}`, query: { subSystem: this.$route.query.subSystem, mapId: this.$route.query.mapId }});
+                Notification.closeAll();
+                exitFullscreen();
+            }).catch(() => {
 
-			});
-		},
-		init() {
-			launchFullscreen();
-			// 刷新考试列表
-			refreshExamList(this.$route.query.userExamId).then(response => {
-				this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
-				this.$store.dispatch('exam/setTotalTime', response.data.duration);
-				this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
-			}).catch(error => {
-				// 如果时50009则表示考试已完成，不能再次进行y
-				if (error.code === 500009) {
-					this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
-				} else {
-					this.$messageBox(this.$t('display.exam.refreshListError'));
-				}
-			});
-		},
-		refresh() {
-			this.isDisable = false;
-			this.$store.dispatch('training/end', null);
-		}
-	}
+            });
+        },
+        init() {
+            launchFullscreen();
+            // 刷新考试列表
+            refreshExamList(this.$route.query.userExamId).then(response => {
+                this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
+                this.$store.dispatch('exam/setTotalTime', response.data.duration);
+                this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
+            }).catch(error => {
+                // 如果时50009则表示考试已完成，不能再次进行y
+                if (error.code === 500009) {
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+                } else {
+                    this.$messageBox(this.$t('display.exam.refreshListError'));
+                }
+            });
+        },
+        refresh() {
+            this.isDisable = false;
+            this.$store.dispatch('training/end', null);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/display/tipExamList.vue b/src/views/display/tipExamList.vue
index ad55ebf76..0a9e1e671 100644
--- a/src/views/display/tipExamList.vue
+++ b/src/views/display/tipExamList.vue
@@ -83,202 +83,203 @@ import { getTrainingDetail } from '@/api/jmap/training';
 import { launchFullscreen, exitFullscreen } from '@/utils/screen';
 
 export default {
-	name: 'TipExamList',
-	components: {
-	},
-	data() {
-		return {
-			training: {
-				id: '',
-				name: '',
-				remarks: ''
-			},
-			isShrink: false,
-			examName: '',
-			courseModel: {
-				id: '',
-				name: '',
-				maxDuration: '',
-				minDuration: '',
-				remarks: '',
-				updateTime: ''
-			},
-			detailShow: false,
-			examIndex: 0
-		};
-	},
-	computed: {
-		...mapGetters('trainingList', [
-			'trainingList'
-		]),
-		remainTime() {
-			return this.$store.state.exam.totalTime - this.$store.state.exam.usedTime;
-		},
-		formatRemainTime() {
-			if (this.remainTime < 0) {
-				this.$message.success(this.$t('display.exam.autoSubmit'));
-				this.submit();
-			}
+    name: 'TipExamList',
+    components: {
+    },
+    data() {
+        return {
+            training: {
+                id: '',
+                name: '',
+                remarks: ''
+            },
+            isShrink: false,
+            examName: '',
+            courseModel: {
+                id: '',
+                name: '',
+                maxDuration: '',
+                minDuration: '',
+                remarks: '',
+                updateTime: ''
+            },
+            detailShow: false,
+            examIndex: 0
+        };
+    },
+    computed: {
+        ...mapGetters('trainingList', [
+            'trainingList'
+        ]),
+        remainTime() {
+            return this.$store.state.exam.totalTime - this.$store.state.exam.usedTime;
+        },
+        formatRemainTime() {
+            if (this.remainTime < 0) {
+                this.$message.success(this.$t('display.exam.autoSubmit'));
+                this.submit();
+            }
 
-			return timeFormat(this.remainTime);
-		},
-		isFirst() {
-			return this.examIndex == 0;
-		},
-		isLast() {
-			return this.examIndex == this.trainingList.length - 1;
-		}
-	},
-	mounted() {
-		this.loadInitData();
-	},
-	methods: {
-		backList() {
-			this.detailShow = true;
-			this.$nextTick(() => {
-				this.$refs.treeQuestion.setCurrentKey(this.$route.query.examQuestionId); // value 绑定的node-key
-			});
-		},
-		// 获取试题详情
-		selectedTraining(obj) {
-			this.trainingList.forEach((item, index) => {
-				if (item.id == obj.id) {
-					this.examIndex = index;
-					return;
-				}
-			});
-			if (obj) {
-				getTrainingDetail(obj.trainingId ).then(res => {
-					this.courseModel = {
-						id: res.data.id,
-						name: res.data.name,
-						maxDuration: res.data.maxDuration,
-						remarks: res.data.remarks,
-						minDuration: res.data.minDuration,
-						updateTime: res.data.updateTime
-					};
-				}).catch(error => {
-					this.$message.error(this.$t('display.exam.getTestInformation')+':' + error.message);
-				});
-			}
+            return timeFormat(this.remainTime);
+        },
+        isFirst() {
+            return this.examIndex == 0;
+        },
+        isLast() {
+            return this.examIndex == this.trainingList.length - 1;
+        }
+    },
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        backList() {
+            this.detailShow = true;
+            this.$nextTick(() => {
+                this.$refs.treeQuestion.setCurrentKey(this.$route.query.examQuestionId); // value 绑定的node-key
+            });
+        },
+        // 获取试题详情
+        selectedTraining(obj) {
+            this.trainingList.forEach((item, index) => {
+                if (item.id == obj.id) {
+                    this.examIndex = index;
+                    return;
+                }
+            });
+            if (obj) {
+                getTrainingDetail(obj.trainingId ).then(res => {
+                    this.courseModel = {
+                        id: res.data.id,
+                        name: res.data.name,
+                        maxDuration: res.data.maxDuration,
+                        remarks: res.data.remarks,
+                        minDuration: res.data.minDuration,
+                        updateTime: res.data.updateTime
+                    };
+                }).catch(error => {
+                    this.$message.error(this.$t('display.exam.getTestInformation') + ':' + error.message);
+                });
+            }
 
-			this.jump(obj);
-		},
-		getTrainDetail(obj) {
-			this.selectedTraining(obj);
-			this.detailShow = false;
-		},
-		// 获取试题列表
-		loadInitData() {
-			// 刷新考试列表
-			refreshExamList(this.$route.query.userExamId).then(response => {
-				this.examName = response.data.examName;
-				this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
-				this.$store.dispatch('exam/setTotalTime', response.data.duration);
-				this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
-				const obj = {
-					trainingId: '',
-					id: ''
-				};
-				if (this.$route.query.examQuestionId && this.$route.query.trainingId) {
-					obj.trainingId = this.$route.query.trainingId;
-					obj.id = this.$route.query.examQuestionId;
-				} else {
-					obj.trainingId = response.data.userExamQuestionsVOs[0].trainingId;
-					obj.id = response.data.userExamQuestionsVOs[0].id;
-				}
-				this.selectedTraining(obj);
-			}).catch(error => {
-				// 如果时50009则表示考试已完成，不能再次进行y
-				if (error.code === 500009) {
-					this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem } });
-				} else {
-					this.$messageBox(this.$t('display.exam.refreshListError'));
+            this.jump(obj);
+        },
+        getTrainDetail(obj) {
+            this.selectedTraining(obj);
+            this.detailShow = false;
+        },
+        // 获取试题列表
+        loadInitData() {
+            // 刷新考试列表
+            refreshExamList(this.$route.query.userExamId).then(response => {
+                this.examName = response.data.examName;
+                this.$store.dispatch('exam/setUsedTime', response.data.usedTime);
+                this.$store.dispatch('exam/setTotalTime', response.data.duration);
+                this.$store.dispatch('trainingList/setTrainingList', response.data.userExamQuestionsVOs).then(response => { });
+                const obj = {
+                    trainingId: '',
+                    id: ''
+                };
+                if (this.$route.query.examQuestionId && this.$route.query.trainingId) {
+                    obj.trainingId = this.$route.query.trainingId;
+                    obj.id = this.$route.query.examQuestionId;
+                } else {
+                    obj.trainingId = response.data.userExamQuestionsVOs[0].trainingId;
+                    obj.id = response.data.userExamQuestionsVOs[0].id;
+                }
+                this.selectedTraining(obj);
+            }).catch(error => {
+                // 如果时50009则表示考试已完成，不能再次进行y
+                if (error.code === 500009) {
+                    this.$router.replace({ path: `/trainingPlatform/result/${this.$route.params.userExamId}`, query: { subSystem: this.$route.query.subSystem } });
+                } else {
+                    this.$messageBox(this.$t('display.exam.refreshListError'));
 
-				}
-			});
+                }
+            });
 
-			this.shrink();
-		},
-		nextExam() {
-			const obj = {
-				trainingId: '',
-				id: ''
-			};
-			if (this.trainingList[this.examIndex + 1] && this.trainingList[this.examIndex + 1].trainingId) {
-				obj.trainingId = this.trainingList[this.examIndex + 1].trainingId;
-				obj.id = this.trainingList[this.examIndex + 1].id;
-				this.examIndex = this.examIndex + 1;
-			}
-			if (obj.trainingId && obj.id) {
-				this.selectedTraining(obj);
-			}
-		},
-		lastExam() {
-			const obj = {
-				trainingId: '',
-				id: ''
-			};
-			if (this.trainingList[this.examIndex - 1] && this.trainingList[this.examIndex - 1].trainingId) {
-				obj.trainingId = this.trainingList[this.examIndex - 1].trainingId;
-				obj.id = this.trainingList[this.examIndex - 1].id;
-				this.examIndex = this.examIndex - 1;
-			}
-			if (obj.trainingId && obj.id) {
-				this.selectedTraining(obj);
-			}
-		},
-		jump(obj) {
-			const query = {
-				group: this.$route.query.group,
-				userExamId: this.$route.query.userExamId,
-				trainingId: obj.trainingId,
-				examQuestionId: obj.id,
-				subSystem: this.$route.query.subSystem,
-				examId: this.$route.query.examId
-			};
-			this.$router.push({ path: '/display/exam', query: query });
-			this.$emit('refresh');
-			launchFullscreen();
-		},
-		overExam() {
-			this.$store.dispatch('exam/isOver').then(isOver => {
-				if (isOver) {
-					this.submit();
-				} else {
-					this.$confirm(this.$t('display.exam.cancleExam'), this.$t('global.tips'), {
-						cancelButtonText: this.$t('global.cancel'),
-						confirmButtonText: this.$t('global.confirm'),
-						type: 'warning',
-						center: true
-					}).then(() => {
-						this.submit();
-					}).catch(() => {
-					});
-				}
-			});
-		},
-		submit() {
-			exitFullscreen();
-			this.$store.dispatch('exam/over').then(() => {
-				this.$store.dispatch('trainingList/clearTrainingList');
-				this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
-			});
-		},
-		shrink() {
-			const height = this.$refs.dragBody.offsetHeight + 40;
-			const top = this.$refs.drapBox.style.top;
-			if (this.isShrink) {
-				this.$refs.drapBox.style.height = '40px';
-				this.$refs.drapBox.style.top = '';
-				this.isShrink = false;
-			} else {
-				this.$refs.drapBox.style.height = height + 'px';
-				this.$refs.drapBox.style.top = top;
-				this.isShrink = true;
-			}
-		}
-	}
+            this.shrink();
+        },
+        nextExam() {
+            const obj = {
+                trainingId: '',
+                id: ''
+            };
+            if (this.trainingList[this.examIndex + 1] && this.trainingList[this.examIndex + 1].trainingId) {
+                obj.trainingId = this.trainingList[this.examIndex + 1].trainingId;
+                obj.id = this.trainingList[this.examIndex + 1].id;
+                this.examIndex = this.examIndex + 1;
+            }
+            if (obj.trainingId && obj.id) {
+                this.selectedTraining(obj);
+            }
+        },
+        lastExam() {
+            const obj = {
+                trainingId: '',
+                id: ''
+            };
+            if (this.trainingList[this.examIndex - 1] && this.trainingList[this.examIndex - 1].trainingId) {
+                obj.trainingId = this.trainingList[this.examIndex - 1].trainingId;
+                obj.id = this.trainingList[this.examIndex - 1].id;
+                this.examIndex = this.examIndex - 1;
+            }
+            if (obj.trainingId && obj.id) {
+                this.selectedTraining(obj);
+            }
+        },
+        jump(obj) {
+            const query = {
+                group: this.$route.query.group,
+                userExamId: this.$route.query.userExamId,
+                trainingId: obj.trainingId,
+                examQuestionId: obj.id,
+                subSystem: this.$route.query.subSystem,
+                examId: this.$route.query.examId,
+                mapId: this.$route.query.mapId
+            };
+            this.$router.push({ path: '/display/exam', query: query });
+            this.$emit('refresh');
+            launchFullscreen();
+        },
+        overExam() {
+            this.$store.dispatch('exam/isOver').then(isOver => {
+                if (isOver) {
+                    this.submit();
+                } else {
+                    this.$confirm(this.$t('display.exam.cancleExam'), this.$t('global.tips'), {
+                        cancelButtonText: this.$t('global.cancel'),
+                        confirmButtonText: this.$t('global.confirm'),
+                        type: 'warning',
+                        center: true
+                    }).then(() => {
+                        this.submit();
+                    }).catch(() => {
+                    });
+                }
+            });
+        },
+        submit() {
+            exitFullscreen();
+            this.$store.dispatch('exam/over').then(() => {
+                this.$store.dispatch('trainingList/clearTrainingList');
+                this.$router.replace({ path: `/trainingPlatform/result/${this.$route.query.userExamId}`, query: {subSystem: this.$route.query.subSystem} });
+            });
+        },
+        shrink() {
+            const height = this.$refs.dragBody.offsetHeight + 40;
+            const top = this.$refs.drapBox.style.top;
+            if (this.isShrink) {
+                this.$refs.drapBox.style.height = '40px';
+                this.$refs.drapBox.style.top = '';
+                this.isShrink = false;
+            } else {
+                this.$refs.drapBox.style.height = height + 'px';
+                this.$refs.drapBox.style.top = top;
+                this.isShrink = true;
+            }
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/exam/detail/courseDetail.vue b/src/views/exam/detail/courseDetail.vue
index 1baa757a3..0b352366c 100644
--- a/src/views/exam/detail/courseDetail.vue
+++ b/src/views/exam/detail/courseDetail.vue
@@ -60,149 +60,149 @@ import { getSessionStorage, setSessionStorage } from '@/utils/auth';
 import localStore from 'storejs';
 
 export default {
-	name: 'ExamDetailView',
-	components: {
-		LimitList
-	},
-	data() {
-		return {
-			loading: false,
-			courseModel: {
-				id: '',
-				name: this.$t('rules.lessonInput'),
-				price: 0,
-				remarks: '',
-				detail: [],
-				pmsList: [],
-				treeList: []
-			},
-			EffectiveTypeList: [],
-			activeName: 'first',
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			expandList: [],
-			valid: false
-		};
-	},
-	computed: {
-		hasPermssion() {
-			return this.courseModel.pmsList.length > 0;
-		},
-		isAddRule() {
-			let sumRemains = 0;
-			if (this.courseModel.pmsList) {
-				this.courseModel.pmsList.forEach(elem => {
-					sumRemains += elem.remains;
-				});
-			}
-			return sumRemains >= 10;
-		},
-		height() {
-			return this.$store.state.app.height - 91;
-		}
-	},
-	watch: {
-		'$route.params.subSystem': function (val) {
-			this.loadInitPage();
-		}
-	},
-	mounted() {
-		this.$Dictionary.effectiveType().then(list => {
-			this.EffectiveTypeList = list;
-		});
-		this.loadInitPage();
-	},
-	methods: {
-		loadInitPage() {
-			getCourseLessonDetail({lessonId: this.$route.query.lessonId}).then(resp =>{
-				if (resp.data) {
-					this.courseModel = {
-						id: resp.data.id,
-						name: resp.data.name,
-						pmsList: resp.data.permissionList || [],
-						prdCode: resp.data.prdCode,
-						mapId: resp.data.mapId,
-						PermissionType: PermissionType.EXAM,
-						treeList: resp.data.examDefinitionList
-					};
-				}
-				if (this.courseModel.pmsList && this.courseModel.pmsList.length >0) {
-					this.valid = true;
-				}
-				this.getExpandList(this.courseModel.id);
-			}).catch(()=>{
-				this.$messageBox('获取考试信息失败！');
-			});
-		},
-		buy() {
-			this.loading = true;
-			this.$router.push({
-				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
-				query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
-			});
-		},
-		checkCourse() {
-			this.loading = true;
-			this.$router.push({
-				path: `${UrlConfig.trainingPlatform.examRuleManage}`,
-				query: { lessonId: this.courseModel.id }
-			});
-		},
-		transfer() { // 转增
-			this.loading = false;
-			if (this.$refs) {
-				this.activeName = 'second';
-				this.$refs.limitList.transfer(this.courseModel);
-			}
-		},
-		distribute() { // 分发
-			this.loading = false;
-			if (this.$refs) {
-				this.activeName = 'second';
-				this.$refs.limitList.distribute(this.courseModel);
-			}
-		},
-		clickEvent(obj, node, data) {
-			if (this.valid || obj.trial) {
-				this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${obj.id}`, query: { subSystem: this.$route.params.subSystem }});
-			} else {
-				this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
-					confirmButtonText: this.$t('tip.confirm'),
-					cancelButtonText: this.$t('tip.cancel')
-				}).then(() => {
-					this.buy();
-				}).catch(() => { });
-			}
-		},
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		nodeExpand(obj, node, ele) {
-			const key = obj.id;
-			this.expandList = this.expandList.filter(item => item!==key);
-			this.expandList.push(key);
-			setSessionStorage('trainingExamExpandList'+this.courseModel.id, this.expandList);
-		},
-		nodeCollapse(obj, node, ele) {
-			const key = obj.id;
-			this.expandList = this.expandList.filter(item => item!==key);
-			setSessionStorage('trainingExamExpandList'+this.courseModel.id, this.expandList);
-		},
-		getExpandList(id) {
-			let expand = getSessionStorage('trainingExamExpandList'+id);
-			expand = expand?(expand+'').split(','):'';
-			if (expand instanceof Array) {
-				this.expandList = expand;
-			}
-		},
-		backLessonList() {
-			localStore.remove('examDetail'+this.$route.params.subSystem);
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${this.$route.params.subSystem}`});
-		}
-	}
+    name: 'ExamDetailView',
+    components: {
+        LimitList
+    },
+    data() {
+        return {
+            loading: false,
+            courseModel: {
+                id: '',
+                name: this.$t('rules.lessonInput'),
+                price: 0,
+                remarks: '',
+                detail: [],
+                pmsList: [],
+                treeList: []
+            },
+            EffectiveTypeList: [],
+            activeName: 'first',
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            expandList: [],
+            valid: false
+        };
+    },
+    computed: {
+        hasPermssion() {
+            return this.courseModel.pmsList.length > 0;
+        },
+        isAddRule() {
+            let sumRemains = 0;
+            if (this.courseModel.pmsList) {
+                this.courseModel.pmsList.forEach(elem => {
+                    sumRemains += elem.remains;
+                });
+            }
+            return sumRemains >= 10;
+        },
+        height() {
+            return this.$store.state.app.height - 91;
+        }
+    },
+    watch: {
+        '$route.params.subSystem': function (val) {
+            this.loadInitPage();
+        }
+    },
+    mounted() {
+        this.$Dictionary.effectiveType().then(list => {
+            this.EffectiveTypeList = list;
+        });
+        this.loadInitPage();
+    },
+    methods: {
+        loadInitPage() {
+            getCourseLessonDetail({lessonId: this.$route.query.lessonId}).then(resp =>{
+                if (resp.data) {
+                    this.courseModel = {
+                        id: resp.data.id,
+                        name: resp.data.name,
+                        pmsList: resp.data.permissionList || [],
+                        prdCode: resp.data.prdCode,
+                        mapId: resp.data.mapId,
+                        PermissionType: PermissionType.EXAM,
+                        treeList: resp.data.examDefinitionList
+                    };
+                }
+                if (this.courseModel.pmsList && this.courseModel.pmsList.length > 0) {
+                    this.valid = true;
+                }
+                this.getExpandList(this.courseModel.id);
+            }).catch(()=>{
+                this.$messageBox('获取考试信息失败！');
+            });
+        },
+        buy() {
+            this.loading = true;
+            this.$router.push({
+                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`,
+                query: { permissionType: PermissionType.EXAM, lessonId: this.courseModel.id, prdCode: this.courseModel.prdCode, mapId: this.courseModel.mapId, subSystem: this.$route.params.subSystem }
+            });
+        },
+        checkCourse() {
+            this.loading = true;
+            this.$router.push({
+                path: `${UrlConfig.trainingPlatform.examRuleManage}`,
+                query: { lessonId: this.courseModel.id }
+            });
+        },
+        transfer() { // 转增
+            this.loading = false;
+            if (this.$refs) {
+                this.activeName = 'second';
+                this.$refs.limitList.transfer(this.courseModel);
+            }
+        },
+        distribute() { // 分发
+            this.loading = false;
+            if (this.$refs) {
+                this.activeName = 'second';
+                this.$refs.limitList.distribute(this.courseModel);
+            }
+        },
+        clickEvent(obj, node, data) {
+            if (this.valid || obj.trial) {
+                this.$router.push({ path: `${UrlConfig.trainingPlatform.examDetail}/${obj.id}`, query: { subSystem: this.$route.params.subSystem, mapId: this.courseModel.mapId }});
+            } else {
+                this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+                    confirmButtonText: this.$t('tip.confirm'),
+                    cancelButtonText: this.$t('tip.cancel')
+                }).then(() => {
+                    this.buy();
+                }).catch(() => { });
+            }
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        nodeExpand(obj, node, ele) {
+            const key = obj.id;
+            this.expandList = this.expandList.filter(item => item !== key);
+            this.expandList.push(key);
+            setSessionStorage('trainingExamExpandList' + this.courseModel.id, this.expandList);
+        },
+        nodeCollapse(obj, node, ele) {
+            const key = obj.id;
+            this.expandList = this.expandList.filter(item => item !== key);
+            setSessionStorage('trainingExamExpandList' + this.courseModel.id, this.expandList);
+        },
+        getExpandList(id) {
+            let expand = getSessionStorage('trainingExamExpandList' + id);
+            expand = expand ? (expand + '').split(',') : '';
+            if (expand instanceof Array) {
+                this.expandList = expand;
+            }
+        },
+        backLessonList() {
+            localStore.remove('examDetail' + this.$route.params.subSystem);
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.examHome}/${this.$route.params.subSystem}`});
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index c69aa427c..e65b2de98 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -60,164 +60,165 @@ import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'ExamDetailView',
-	data() {
-		return {
-			loading: false,
-			examDetails: {
-				lessonId: '',
-				name: '',
-				remarks: '',
-				examDefinitionRulesVOList: [],
-				startTime: '',
-				endTime: '',
-				fullPoint: '',
-				passingPoint: '',
-				duration: '',
-				type: ''
-			},
-			typeList: [],
-			examList: [],
-			trainingOperateTypeMap: {}
-		};
-	},
-	computed: {
-		...mapGetters('trainingList', [
-			'trainingList'
-		]),
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	watch: {
-		'$route.params.examId': function (val) {
-			this.loadInitPage(val);
-		}
-	},
-	async mounted() {
-		this.trainingOperateTypeMap = {};
-		this.$Dictionary.stationControl().then(list => {
-			this.trainingOperateTypeMap['01'] = list; // 控制权实训
-		});
-		this.$Dictionary.signalOperation().then(list => {
-			this.trainingOperateTypeMap['02'] = list; // 信号机实训
-		});
-		this.$Dictionary.switchOperation().then(list => {
-			this.trainingOperateTypeMap['03'] = list; // 道岔实训
-		});
-		this.$Dictionary.sectionOperation().then(list => {
-			this.trainingOperateTypeMap['04'] = list; // 区段实训
-		});
-		this.$Dictionary.stationStandOperation().then(list => {
-			this.trainingOperateTypeMap['05'] = list; // 站台实训
-		});
-		this.$Dictionary.trainPlanOperation().then(list => {
-			this.trainingOperateTypeMap['06'] = list; // 行车计划实训
-		});
-		this.$Dictionary.trainOperation().then(list => {
-			this.trainingOperateTypeMap['07'] = list; // 列车实训
-		});
-		await this.getList();
-		this.loadInitPage(this.$route.params.examId);
-	},
-	methods: {
-		async getList() {
-			this.typeList = [];
-			await getDetailList('training_type').then(res => {
-				this.typeList = res.data;
-			});
-		},
-		async loadInitPage(examId) {
-			if (examId) {
-				const res = await getExamLessonDetail(examId);
-				this.examDetails = res.data;
-				this.examDetails.examDefinitionRulesVOList.forEach((res, index) => {
-					res.chapterIdLong = Number(res.num) * Number(res.point);
-					this.typeList.forEach(v => {
-						if (res.trainingType == v.code) {
-							this.examDetails.examDefinitionRulesVOList[index].name = v.name;
-							if (res.operateType) {
-								this.trainingOperateTypeMap[res.trainingType].forEach(item => {
-									if (item.code == res.operateType) {
-										this.examDetails.examDefinitionRulesVOList[index].name = `${this.examDetails.examDefinitionRulesVOList[index].name}-${item.name}`;
-										return;
-									}
-								});
-							}
-						}
-					});
-				});
+    name: 'ExamDetailView',
+    data() {
+        return {
+            loading: false,
+            examDetails: {
+                lessonId: '',
+                name: '',
+                remarks: '',
+                examDefinitionRulesVOList: [],
+                startTime: '',
+                endTime: '',
+                fullPoint: '',
+                passingPoint: '',
+                duration: '',
+                type: ''
+            },
+            typeList: [],
+            examList: [],
+            trainingOperateTypeMap: {}
+        };
+    },
+    computed: {
+        ...mapGetters('trainingList', [
+            'trainingList'
+        ]),
+        height() {
+            return this.$store.state.app.height - 50;
+        }
+    },
+    watch: {
+        '$route.params.examId': function (val) {
+            this.loadInitPage(val);
+        }
+    },
+    async mounted() {
+        this.trainingOperateTypeMap = {};
+        this.$Dictionary.stationControl().then(list => {
+            this.trainingOperateTypeMap['01'] = list; // 控制权实训
+        });
+        this.$Dictionary.signalOperation().then(list => {
+            this.trainingOperateTypeMap['02'] = list; // 信号机实训
+        });
+        this.$Dictionary.switchOperation().then(list => {
+            this.trainingOperateTypeMap['03'] = list; // 道岔实训
+        });
+        this.$Dictionary.sectionOperation().then(list => {
+            this.trainingOperateTypeMap['04'] = list; // 区段实训
+        });
+        this.$Dictionary.stationStandOperation().then(list => {
+            this.trainingOperateTypeMap['05'] = list; // 站台实训
+        });
+        this.$Dictionary.trainPlanOperation().then(list => {
+            this.trainingOperateTypeMap['06'] = list; // 行车计划实训
+        });
+        this.$Dictionary.trainOperation().then(list => {
+            this.trainingOperateTypeMap['07'] = list; // 列车实训
+        });
+        await this.getList();
+        this.loadInitPage(this.$route.params.examId);
+    },
+    methods: {
+        async getList() {
+            this.typeList = [];
+            await getDetailList('training_type').then(res => {
+                this.typeList = res.data;
+            });
+        },
+        async loadInitPage(examId) {
+            if (examId) {
+                const res = await getExamLessonDetail(examId);
+                this.examDetails = res.data;
+                this.examDetails.examDefinitionRulesVOList.forEach((res, index) => {
+                    res.chapterIdLong = Number(res.num) * Number(res.point);
+                    this.typeList.forEach(v => {
+                        if (res.trainingType == v.code) {
+                            this.examDetails.examDefinitionRulesVOList[index].name = v.name;
+                            if (res.operateType) {
+                                this.trainingOperateTypeMap[res.trainingType].forEach(item => {
+                                    if (item.code == res.operateType) {
+                                        this.examDetails.examDefinitionRulesVOList[index].name = `${this.examDetails.examDefinitionRulesVOList[index].name}-${item.name}`;
+                                        return;
+                                    }
+                                });
+                            }
+                        }
+                    });
+                });
 
-			}
-		},
-		buy() {
-			this.loading = true;
-			getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
-				this.$router.push({
-					path: `${UrlConfig.trainingPlatform.pay}/${this.examDetails.lessonId}`,
-					query: { permissionType: PermissionType.EXAM, lessonId: this.examDetails.lessonId, prdCode: res.data.prdCode, mapId: res.data.mapId }
-				});
-			}).catch(() => {
-				this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
-				this.loading = false;
-			});
+            }
+        },
+        buy() {
+            this.loading = true;
+            getPublishLessonDetail({ id: this.examDetails.lessonId }).then((res) => {
+                this.$router.push({
+                    path: `${UrlConfig.trainingPlatform.pay}/${this.examDetails.lessonId}`,
+                    query: { permissionType: PermissionType.EXAM, lessonId: this.examDetails.lessonId, prdCode: res.data.prdCode, mapId: res.data.mapId }
+                });
+            }).catch(() => {
+                this.$messageBox(this.$t('error.obtainCourseDetailsFailed'));
+                this.loading = false;
+            });
 
-		},
-		async examDetail() {
-			const data = this.examDetails;
-			try {
-				const response = await generateExamList(data.id);
-				this.examList = response.data.userExamQuestionsVOs;
-				this.userExam = response.data;
-				const list = response.data.userExamQuestionsVOs;
-				await this.$store.dispatch('exam/setUsedTime', this.userExam.usedTime);
-				await this.$store.dispatch('exam/setTotalTime', this.userExam.duration);
-				await this.$store.dispatch('trainingList/setTrainingList', list);
-			} catch (error) {
-				// 判断是否有考试权限，如果没有权限则跳到购买页面，否则报错
-				if (error.code === 500004) {
-					this.$confirm( this.$t('tip.noCourseAuthority'), this.$t('tip.hint'), {
-						cancelButtonText: this.$t('global.cancel'),
-						confirmButtonText: this.$t('global.confirm'),
-						type: 'warning',
-						center: true
-					}).then(() => {
-						this.buy();
-					}).catch(() => { });
-				} else if (error.code === 500005) {
-					this.$messageBox(this.$t('tip.notWithinTheScopeOfTheExamination'));
-				} else {
-					this.$messageBox(`${error.message}`);
-				}
-			}
-		},
-		async exmaStart() {
-			this.loading = true;
-			await this.examDetail();
-			if (this.examList.length) {
-				examNotify({ examId: this.$route.params.examId }).then(resp => {
-					const query = {
-						group: resp.data,
-						trainingId: this.examList[0].trainingId,
-						userExamId: this.userExam.id,
-						examQuestionId: this.examList[0].id,
-						subSystem: this.$route.query.subSystem,
-						examId: this.$route.params.examId
-					};
-					this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
-					launchFullscreen();
-				}).catch(error => {
-					this.loading = false;
-					this.$messageBox( this.$t('error.createSimulationFailed') +`: ${error.message}`);
-				});
-			} else {
-				this.loading = false;
-			}
-		},
-		back() {
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.query.subSystem}`, query: {lessonId: this.examDetails.lessonId}});
-		}
-	}
+        },
+        async examDetail() {
+            const data = this.examDetails;
+            try {
+                const response = await generateExamList(data.id);
+                this.examList = response.data.userExamQuestionsVOs;
+                this.userExam = response.data;
+                const list = response.data.userExamQuestionsVOs;
+                await this.$store.dispatch('exam/setUsedTime', this.userExam.usedTime);
+                await this.$store.dispatch('exam/setTotalTime', this.userExam.duration);
+                await this.$store.dispatch('trainingList/setTrainingList', list);
+            } catch (error) {
+                // 判断是否有考试权限，如果没有权限则跳到购买页面，否则报错
+                if (error.code === 500004) {
+                    this.$confirm( this.$t('tip.noCourseAuthority'), this.$t('tip.hint'), {
+                        cancelButtonText: this.$t('global.cancel'),
+                        confirmButtonText: this.$t('global.confirm'),
+                        type: 'warning',
+                        center: true
+                    }).then(() => {
+                        this.buy();
+                    }).catch(() => { });
+                } else if (error.code === 500005) {
+                    this.$messageBox(this.$t('tip.notWithinTheScopeOfTheExamination'));
+                } else {
+                    this.$messageBox(`${error.message}`);
+                }
+            }
+        },
+        async exmaStart() {
+            this.loading = true;
+            await this.examDetail();
+            if (this.examList.length) {
+                examNotify({ examId: this.$route.params.examId }).then(resp => {
+                    const query = {
+                        group: resp.data,
+                        trainingId: this.examList[0].trainingId,
+                        userExamId: this.userExam.id,
+                        examQuestionId: this.examList[0].id,
+                        subSystem: this.$route.query.subSystem,
+                        examId: this.$route.params.examId,
+                        mapId: this.$route.query.mapId
+                    };
+                    this.$router.push({ path: `${UrlConfig.display}/exam`, query: query });
+                    launchFullscreen();
+                }).catch(error => {
+                    this.loading = false;
+                    this.$messageBox( this.$t('error.createSimulationFailed') + `: ${error.message}`);
+                });
+            } else {
+                this.loading = false;
+            }
+        },
+        back() {
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.course}/${this.$route.query.subSystem}`, query: {lessonId: this.examDetails.lessonId}});
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/exam/detail/questionDetail.vue b/src/views/exam/detail/questionDetail.vue
index f434e175c..e8939b956 100644
--- a/src/views/exam/detail/questionDetail.vue
+++ b/src/views/exam/detail/questionDetail.vue
@@ -35,83 +35,83 @@ import { launchFullscreen } from '@/utils/screen';
 import { timeFormat } from '@/utils/date';
 
 export default {
-	name: 'ExamDetailList',
-	filters: {
-		setTime(val) {
-			return val;
-		}
-	},
-	data() {
-		return {
-			loading: false,
-			courseModel: {
-				id: '',
-				name: '',
-				skinCode: '',
-				maxDuration: '',
-				minDuration: '',
-				remarks: '',
-				updateTime: ''
-			}
-		};
-	},
-	computed: {
-		formatExamUsedTime() {
-			return timeFormat(this.$store.state.exam.usedTime);
-		},
-		height() {
-			return this.$store.state.app.height;
-		}
-	},
-	watch: {
-		$route(newVal) {
-			this.initLoadPage();
-		}
-	},
-	mounted() {
-		this.initLoadPage();
-	},
-	methods: {
-		initLoadPage() {
-			const trainingId = this.$route.query.trainingId;
-			if (parseInt(trainingId)) {
-				getTrainingDetail(trainingId).then(res => {
-					this.courseModel = {
-						id: res.data.id,
-						name: res.data.name,
-						skinCode: res.data.skinCode,
-						maxDuration: res.data.maxDuration,
-						remarks: res.data.remarks,
-						minDuration: res.data.minDuration,
-						updateTime: res.data.updateTime
-					};
-				}).catch(error => {
-					this.$message.error( this.$t('error.getTestInformationFailed') + ':' + error.message);
-				});
-			}
-		},
-		start() {
-			this.loading = true;
-			const query = { skinCode: this.$route.query.skinCode, trainingId: this.$route.query.trainingId, userExamId: this.$route.query.userExamId, examQuestionId: this.$route.params.examQuestionId };
-			this.$router.push({ path: '/display/exam', query: query });
-			launchFullscreen();
-		},
-		back() {
-			this.loading = true;
-			this.$confirm( this.$t('tip.giveUpTheExamTip'), this.$t('tip.hint'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				// 放弃试卷接口
-				setExamGive(this.$route.query.userExamId).then(() => {
-					this.$router.back();
-				});
-			}).catch(() => {
-				this.loading = false;
-			});
-		}
-	}
+    name: 'ExamDetailList',
+    filters: {
+        setTime(val) {
+            return val;
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            courseModel: {
+                id: '',
+                name: '',
+                skinCode: '',
+                maxDuration: '',
+                minDuration: '',
+                remarks: '',
+                updateTime: ''
+            }
+        };
+    },
+    computed: {
+        formatExamUsedTime() {
+            return timeFormat(this.$store.state.exam.usedTime);
+        },
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    watch: {
+        $route(newVal) {
+            this.initLoadPage();
+        }
+    },
+    mounted() {
+        this.initLoadPage();
+    },
+    methods: {
+        initLoadPage() {
+            const trainingId = this.$route.query.trainingId;
+            if (parseInt(trainingId)) {
+                getTrainingDetail(trainingId).then(res => {
+                    this.courseModel = {
+                        id: res.data.id,
+                        name: res.data.name,
+                        skinCode: res.data.skinCode,
+                        maxDuration: res.data.maxDuration,
+                        remarks: res.data.remarks,
+                        minDuration: res.data.minDuration,
+                        updateTime: res.data.updateTime
+                    };
+                }).catch(error => {
+                    this.$message.error( this.$t('error.getTestInformationFailed') + ':' + error.message);
+                });
+            }
+        },
+        start() {
+            this.loading = true;
+            const query = { skinCode: this.$route.query.skinCode, trainingId: this.$route.query.trainingId, userExamId: this.$route.query.userExamId, examQuestionId: this.$route.params.examQuestionId };
+            this.$router.push({ path: '/display/exam', query: query });
+            launchFullscreen();
+        },
+        back() {
+            this.loading = true;
+            this.$confirm( this.$t('tip.giveUpTheExamTip'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                // 放弃试卷接口
+                setExamGive(this.$route.query.userExamId).then(() => {
+                    this.$router.back();
+                });
+            }).catch(() => {
+                this.loading = false;
+            });
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index 1e03c7e2e..14603be37 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -60,156 +60,156 @@ import { launchFullscreen } from '@/utils/screen';
 import localStore from 'storejs';
 
 export default {
-	name: 'LessonDetail',
-	components: {
-		LimitList
-	},
-	data() {
-		return {
-			num: 5,
-			loading: false,
-			WhetherTypeList: [],
-			EffectiveTypeList: [],
-			courseModel: {
-				id: '',
-				name: '',
-				pmsList: []
-			},
-			activeName: 'first',
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			expandList: []
-		};
-	},
-	computed: {
-		hasPermssion() {
-			return this.courseModel.pmsList.length > 0;
-		},
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	watch: {
-		$route(newVal) {
-			this.initLoadPage();
-		}
-	},
-	mounted() {
-		this.$Dictionary.effectiveType().then(list => {
-			this.EffectiveTypeList = list;
-		});
-		this.initLoadPage();
-	},
-	methods: {
-		initLoadPage() {
-			getPublishLessonTree(this.$route.query.lessonId).then(response => {
-				if (response.data.tree && response.data.tree.length>0) {
-					this.courseModel = {
-						id: response.data.tree[0].id,
-						name: response.data.tree[0].name,
-						pmsList: response.data.permissionList || [],
-						treeList: response.data.tree,
-						prdCode: this.$route.query.prdCode,
-						mapId: this.$route.query.mapId,
-						PermissionType: PermissionType.LESSON
-					};
-				}
-				this.getExpandList(this.courseModel.id);
-			}).catch(error => {
-				this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
-			});
-		},
-		transfer() {
-			this.loading = false;
-			if (this.$refs) {
-				this.activeName = 'second';
-				this.$refs.limitList.transfer(this.courseModel);
-			}
-		},
-		distribute() {
-			this.loading = false;
-			if (this.$refs) {
-				this.activeName = 'second';
-				this.$refs.limitList.distribute(this.courseModel);
-			}
-		},
-		clickEvent(obj, node, ele) {
-			if (obj && obj.type==='Training') {
-				if (obj.valid) {
-					this.loading = true;
-					trainingNotify({ trainingId: obj.id }).then(resp => {
-						const query = {
-							group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId
-						};
-						this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
-						launchFullscreen();
-					}).catch(error => {
-						this.loading = false;
-						this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
-					});
-				} else {
-					this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
-						confirmButtonText: this.$t('tip.confirm'),
-						cancelButtonText: this.$t('tip.cancel')
-					}).then(() => {
-						this.buy();
-					}).catch(() => { });
-				}
-			}
-		},
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		buy() {
-			this.$router.push({
-				path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
+    name: 'LessonDetail',
+    components: {
+        LimitList
+    },
+    data() {
+        return {
+            num: 5,
+            loading: false,
+            WhetherTypeList: [],
+            EffectiveTypeList: [],
+            courseModel: {
+                id: '',
+                name: '',
+                pmsList: []
+            },
+            activeName: 'first',
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            expandList: []
+        };
+    },
+    computed: {
+        hasPermssion() {
+            return this.courseModel.pmsList.length > 0;
+        },
+        height() {
+            return this.$store.state.app.height - 50;
+        }
+    },
+    watch: {
+        $route(newVal) {
+            this.initLoadPage();
+        }
+    },
+    mounted() {
+        this.$Dictionary.effectiveType().then(list => {
+            this.EffectiveTypeList = list;
+        });
+        this.initLoadPage();
+    },
+    methods: {
+        initLoadPage() {
+            getPublishLessonTree(this.$route.query.lessonId).then(response => {
+                if (response.data.tree && response.data.tree.length > 0) {
+                    this.courseModel = {
+                        id: response.data.tree[0].id,
+                        name: response.data.tree[0].name,
+                        pmsList: response.data.permissionList || [],
+                        treeList: response.data.tree,
+                        prdCode: this.$route.query.prdCode,
+                        mapId: this.$route.query.mapId,
+                        PermissionType: PermissionType.LESSON
+                    };
+                }
+                this.getExpandList(this.courseModel.id);
+            }).catch(error => {
+                this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
+            });
+        },
+        transfer() {
+            this.loading = false;
+            if (this.$refs) {
+                this.activeName = 'second';
+                this.$refs.limitList.transfer(this.courseModel);
+            }
+        },
+        distribute() {
+            this.loading = false;
+            if (this.$refs) {
+                this.activeName = 'second';
+                this.$refs.limitList.distribute(this.courseModel);
+            }
+        },
+        clickEvent(obj, node, ele) {
+            if (obj && obj.type === 'Training') {
+                if (obj.valid) {
+                    this.loading = true;
+                    trainingNotify({ trainingId: obj.id }).then(resp => {
+                        const query = {
+                            group: resp.data, trainingId: obj.id, lessonId: this.$route.query.lessonId, mapId: this.courseModel.mapId
+                        };
+                        this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
+                        launchFullscreen();
+                    }).catch(error => {
+                        this.loading = false;
+                        this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
+                    });
+                } else {
+                    this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+                        confirmButtonText: this.$t('tip.confirm'),
+                        cancelButtonText: this.$t('tip.cancel')
+                    }).then(() => {
+                        this.buy();
+                    }).catch(() => { });
+                }
+            }
+        },
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        buy() {
+            this.$router.push({
+                path: `${UrlConfig.trainingPlatform.pay}/${this.courseModel.id}`, query:
                     { permissionType: PermissionType.LESSON, lessonId: this.courseModel.id, prdCode: this.$route.query.prdCode, mapId: this.$route.query.mapId, subSystem: this.$route.params.subSystem }
-			});
-		},
-		nodeExpand(obj, node, ele) {
-			const key = obj.id;
-			this.expandList = this.expandList.filter(item => item!==key);
-			this.expandList.push(key);
-			setSessionStorage('trainingTeachExpandList'+this.courseModel.id, this.expandList);
-		},
-		nodeCollapse(obj, node, ele) {
-			const key = obj.id;
-			if (obj.type === 'Lesson') {
-				this.expandList = [];
-			} else {
-				this.expandList = this.expandList.filter(item => item!==key);
-			}
-			setSessionStorage('trainingTeachExpandList'+this.courseModel.id, this.expandList);
-		},
-		getExpandList(id) {
-			let expand = getSessionStorage('trainingTeachExpandList'+id);
-			expand = expand?(expand+'').split(','):'';
-			if (expand instanceof Array) {
-				this.expandList = expand;
-			}
-		},
-		startTraining(data) {
-			if (data && data.type==='Training') {
-				if (data.valid) {
-					this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${data.id}/${this.courseModel.id}`});
-				} else {
-					this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
-						confirmButtonText: this.$t('tip.confirm'),
-						cancelButtonText: this.$t('tip.cancel')
-					}).then(() => {
-						this.buy();
-					}).catch(() => { });
-				}
-			}
-		},
-		backLessonList() {
-			localStore.remove('teachDetail'+this.$route.params.subSystem);
-			this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${this.$route.params.subSystem}`});
-		}
-	}
+            });
+        },
+        nodeExpand(obj, node, ele) {
+            const key = obj.id;
+            this.expandList = this.expandList.filter(item => item !== key);
+            this.expandList.push(key);
+            setSessionStorage('trainingTeachExpandList' + this.courseModel.id, this.expandList);
+        },
+        nodeCollapse(obj, node, ele) {
+            const key = obj.id;
+            if (obj.type === 'Lesson') {
+                this.expandList = [];
+            } else {
+                this.expandList = this.expandList.filter(item => item !== key);
+            }
+            setSessionStorage('trainingTeachExpandList' + this.courseModel.id, this.expandList);
+        },
+        getExpandList(id) {
+            let expand = getSessionStorage('trainingTeachExpandList' + id);
+            expand = expand ? (expand + '').split(',') : '';
+            if (expand instanceof Array) {
+                this.expandList = expand;
+            }
+        },
+        startTraining(data) {
+            if (data && data.type === 'Training') {
+                if (data.valid) {
+                    this.$router.push({ path: `${UrlConfig.trainingPlatform.practical}/${data.id}/${this.courseModel.id}`});
+                } else {
+                    this.$confirm(this.$t('tip.accessCourseNo'), this.$t('tip.hint'), {
+                        confirmButtonText: this.$t('tip.confirm'),
+                        cancelButtonText: this.$t('tip.cancel')
+                    }).then(() => {
+                        this.buy();
+                    }).catch(() => { });
+                }
+            }
+        },
+        backLessonList() {
+            localStore.remove('teachDetail' + this.$route.params.subSystem);
+            this.$router.push({ path: `${UrlConfig.trainingPlatform.teachHome}/${this.$route.params.subSystem}`});
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/teach/practical/index.vue b/src/views/teach/practical/index.vue
deleted file mode 100644
index f4221b80d..000000000
--- a/src/views/teach/practical/index.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-card>
-    <div slot="header" style="text-align: center;">
-      <b>{{ $t('teach.trainingName') }} {{ courseModel.name }}</b>
-    </div>
-    <div style="margin:50px">
-      <el-scrollbar wrap-class="scrollbar-wrapper" :style="{ height: height - 190 +'px' }">
-        <p class="list-item">
-          <span class="list-label">{{ $t('teach.trainingTime') }}</span>
-          <span class="list-elem"> {{ courseModel.minDuration | setTime }} {{ $t('teach.seconds') }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('teach.trainingMaximum') }}</span>
-          <span class="list-elem">{{ courseModel.maxDuration | setTime }} {{ $t('teach.seconds') }}</span>
-        </p>
-        <p class="list-item">
-          <span class="list-label">{{ $t('teach.trainingInstructions') }}</span>
-          <span class="list-elem">{{ courseModel.remarks }}</span>
-        </p>
-      </el-scrollbar>
-    </div>
-    <div class="btn-start">
-      <el-button :loading="loading" type="primary" @click="start">{{ $t('teach.startTraining') }}</el-button>
-      <el-button @click="back">{{ $t('global.back') }}</el-button>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import { getTrainingDetail } from '@/api/jmap/training';
-import { trainingNotify } from '@/api/simulation';
-import { UrlConfig } from '@/router/index';
-import { launchFullscreen } from '@/utils/screen';
-
-export default {
-	name: 'LessonPracticalDetail',
-	filters: {
-		setTime(val) {
-			return val;
-		}
-	},
-	data() {
-		return {
-			loading: false,
-			courseModel: {
-				id: '',
-				name: '',
-				maxDuration: '',
-				minDuration: '',
-				remarks: '',
-				updateTime: ''
-			}
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 50;
-		}
-	},
-	watch: {
-		$route(newVal) {
-			this.initLoadPage();
-		}
-	},
-	mounted() {
-		this.initLoadPage();
-	},
-	methods: {
-		initLoadPage() {
-			const trainingId = this.$route.params.trainingId;
-			if (parseInt(trainingId)) {
-				getTrainingDetail(trainingId)
-					.then(res => {
-						this.courseModel = {
-							id: res.data.id,
-							name: res.data.name,
-							maxDuration: res.data.maxDuration,
-							remarks: res.data.remarks,
-							minDuration: res.data.minDuration,
-							updateTime: res.data.updateTime
-						};
-					})
-					.catch(error => {
-						this.$message.error(this.$t('tip.failedCourse') + ':' + error.message);
-					});
-			}
-		},
-		start() {
-			this.loading = true;
-			trainingNotify({ trainingId: this.$route.params.trainingId }).then(resp => {
-				const query = {
-					group: resp.data, trainingId: this.$route.params.trainingId, lessonId: this.$route.params.lessonId
-				};
-				this.$router.push({ path: `${UrlConfig.display}/teach`, query: query });
-				launchFullscreen();
-			}).catch(error => {
-				this.loading = false;
-				this.$messageBox(`${this.$t('tip.createSimulationFaild')} : ${error.message}`);
-			});
-		},
-		back() {
-			this.$router.back();
-		}
-	}
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-    @import "src/styles/mixin.scss";
-
-    .list-item {
-        font-size: 16px;
-        margin-bottom: 20px;
-    }
-
-    .list-label {
-        display: inline-block;
-        text-align: right;
-        width: 160px;
-    }
-
-    .list-elem {
-        color: #808080 !important;
-    }
-
-    .btn-start {
-        position: relative;
-        text-align: center;
-        justify-content: center;
-        transform: translateY(-20px);
-    }
-</style>

From 4918c78204f43f10b3b5f73a8df87dd61e759ce5 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 16:50:35 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/runPlan/draft/station/{skinCode}/bySkin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/jmap/lessondraft.js                   | 122 ++-
 src/api/runplan.js                            | 416 +++++-----
 .../beijing_01/menusPlan/createTodayPlan.vue  | 233 +++---
 .../chengdu_03/menusPlan/createTodayPlan.vue  | 235 +++---
 .../chengdu_04/menusPlan/createTodayPlan.vue  | 233 +++---
 .../fuzhou_01/menusPlan/createTodayPlan.vue   | 233 +++---
 src/views/display/menuSchema.vue              | 288 +++----
 src/views/jointTraining/menuSchema.vue        | 219 +++---
 src/views/map/runplan/chart.vue               | 708 +++++++++---------
 src/views/planMonitor/editTool/schedule.vue   |   4 +-
 src/views/publish/runPlanTemplate/index.vue   | 334 ++++-----
 11 files changed, 1506 insertions(+), 1519 deletions(-)

diff --git a/src/api/jmap/lessondraft.js b/src/api/jmap/lessondraft.js
index 23b7c3322..a199cbb53 100644
--- a/src/api/jmap/lessondraft.js
+++ b/src/api/jmap/lessondraft.js
@@ -2,111 +2,103 @@ import request from '@/utils/request';
 
 /** 获取课程树*/
 export function getLessonTree(skinCode) {
-	return request({
-		url: `/api/lessonDraft/${skinCode}/tree`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/lessonDraft/${skinCode}/tree`,
+        method: 'get'
+    });
 }
 
 /** 获取课程详细内容*/
 export function getLessonDetail(data) {
-	return request({
-		url: `/api/lessonDraft/${data.id}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/lessonDraft/${data.id}`,
+        method: 'get'
+    });
 }
 
 /** 创建课程*/
 export function createLesson(data) {
-	return request({
-		url: '/api/lessonDraft',
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: '/api/lessonDraft',
+        method: 'post',
+        data: data
+    });
 }
 
 /** 从发布课程创建*/
 export function createLessonFromPublish(data) {
-	return request({
-		url: '/api/lessonDraft/createForm',
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: '/api/lessonDraft/createForm',
+        method: 'post',
+        data: data
+    });
 }
 /** 更新课程*/
 export function updateLesson(data) {
-	return request({
-		url: `/api/lessonDraft/${data.id}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/lessonDraft/${data.id}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 删除课程*/
 export function delLesson(data) {
-	return request({
-		url: `/api/lessonDraft/${data.id}`,
-		method: 'delete',
-		data: data
-	});
+    return request({
+        url: `/api/lessonDraft/${data.id}`,
+        method: 'delete',
+        data: data
+    });
 }
 
 /** 创建课程章节*/
 export function createLessonChapter(data) {
-	return request({
-		url: `/api/lessonDraft/${data.lessonId}/chapter`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/lessonDraft/${data.lessonId}/chapter`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 更新课程章节*/
 export function updateLessonChapter(data) {
-	return request({
-		url: `/api/lessonDraft/chapter/${data.id}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/lessonDraft/chapter/${data.id}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 创建课程章节详细内容*/
 export function getLessonChapterDetail(data) {
-	return request({
-		url: `/api/lessonDraft/chapter/${data.id}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/lessonDraft/chapter/${data.id}`,
+        method: 'get'
+    });
 }
 
 /** 发布课程*/
 export function publishLesson(data) {
-	return request({
-		url: `/api/lessonDraft/${data.id}/publish`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/lessonDraft/${data.id}/publish`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 课程章节拖拽排序*/
 export function dragSortLessonChapter(data) {
-	return request({
-		url: '/api/lessonDraft/dragSort',
-		method: 'put',
-		data: data
-	});
-}
-
-/** 根据lessonId获取课程名称*/
-export function getLessonNameByMapIdAndLessonId(model) {
-	return request({
-		url: `/api/lessonDraft/${model.mapId}/${model.lessonId}`,
-		method: 'get'
-	});
+    return request({
+        url: '/api/lessonDraft/dragSort',
+        method: 'put',
+        data: data
+    });
 }
 
 export function getLessonDrftList(params) {
-	return request({
-		url: `/api/lessonDraft`,
-		method: 'get',
-		params: params
-	});
+    return request({
+        url: `/api/lessonDraft`,
+        method: 'get',
+        params: params
+    });
 }
diff --git a/src/api/runplan.js b/src/api/runplan.js
index b2235dfb0..8ef1d184b 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -4,317 +4,307 @@ import request from '@/utils/request';
  * 获取运行图列表
  */
 export function getRunPlanList() {
-	return request({
-		url: '/api/runPlan/draft/tree',
-		method: 'get'
-	});
+    return request({
+        url: '/api/runPlan/draft/tree',
+        method: 'get'
+    });
 }
 
 /**
  * 获取地图速度等级列表
  */
 export function getSpeedLevels(skinCode) {
-	return request({
-		url: `/api/runPlan/draft/${skinCode}/speed`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${skinCode}/speed`,
+        method: 'get'
+    });
 }
 
 /**
  * 新建地图速度等级列表
  */
 export function newSpeedLevels(data) {
-	return request({
-		url: '/api/runPlan/draft/speed',
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: '/api/runPlan/draft/speed',
+        method: 'post',
+        data: data
+    });
 }
 
 /**
  * 获取运行图的车站列表
  */
 export function getStationList(mapId) {
-	return request({
-		url: `/api/runPlan/draft/station/${mapId}`,
-		method: 'get'
-	});
-}
-
-/**
- * 通过皮肤获取运行图车站列表
- */
-export function getStationListBySkinCode(skinCode) {
-	return request({
-		url: `/api/runPlan/draft/station/${skinCode}/bySkin`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/station/${mapId}`,
+        method: 'get'
+    });
 }
 
 /**
  * 创建运行图
  */
 export function newRunPlan(data) {
-	return request({
-		url: '/api/runPlan/draft',
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: '/api/runPlan/draft',
+        method: 'post',
+        data: data
+    });
 }
 
 /**
  * 查询运行图获取数据
  */
 export function queryRunPlan(planId) {
-	return request({
-		url: `/api/runPlan/draft/${planId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}`,
+        method: 'get'
+    });
 }
 
 // 根据skinCode查询发布运行图列表
 export function queryRunPlanList(skinCode) {
-	return request({
-		url: `/api/runPlan/template/skin/${skinCode}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/template/skin/${skinCode}`,
+        method: 'get'
+    });
 }
 
 // 从发布运行图创建新运行图
 export function postCreatePlan(data) {
-	return request({
-		url: `/api/runPlan/draft/createFrom/${data.templateId}`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/createFrom/${data.templateId}`,
+        method: 'post',
+        data: data
+    });
 }
 
 // 删除运行图
 export function deleteRunPlan(planId) {
-	return request({
-		url: `/api/runPlan/draft/${planId}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}`,
+        method: 'delete'
+    });
 }
 
 // 修改运行图内容
 export function putRunPlanDetail(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /**
  * 发布运行图
  */
 export function publishRunPlan(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/publish`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/publish`,
+        method: 'post',
+        data: data
+    });
 }
 
 /**
  * 导入真实运行图
  */
 export function importRunPlan(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.skinCode}/prdPlan`,
-		method: 'post',
-		data: data.runPlanList
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.skinCode}/prdPlan`,
+        method: 'post',
+        data: data.runPlanList
+    });
 }
 
 /** 获取运行图停车点列表*/
 export function getRunPlanStopPointList(skinCode) {
-	return request({
-		url: `/api/runPlan/draft/stopPoint/${skinCode}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/stopPoint/${skinCode}`,
+        method: 'get'
+    });
 }
 
 /** 运行图*/
 export function getRpListByMapId(mapId) {
-	return request({
-		url: `/api/runPlan/draft/${mapId}/list`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${mapId}/list`,
+        method: 'get'
+    });
 }
 
 /** 获取站间运行时间*/
 export function getStationRunning(skinCode) {
-	return request({
-		url: `/api/runPlan/draft/${skinCode}/stationRunning`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${skinCode}/stationRunning`,
+        method: 'get'
+    });
 }
 
 /** 设置站间运行时间*/
 export function setStationRunning(skinCode, data) {
-	return request({
-		url: `/api/runPlan/draft/${skinCode}/stationRunning`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${skinCode}/stationRunning`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 创建运行图*/
 export function createEmptyPlan(data) {
-	return request({
-		url: `/api/runPlan/draft`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 查询运行图服务号是否存在*/
 export function checkServiceNumberExist({ planId, serviceNumber }) {
-	return request({
-		url: `/api/runPlan/draft/${planId}/${serviceNumber}/service`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}/${serviceNumber}/service`,
+        method: 'get'
+    });
 }
 
 /** 查询交路列表*/
 export function getRoutingList(planId) {
-	return request({
-		url: `/api/runPlan/draft/${planId}/routingList`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}/routingList`,
+        method: 'get'
+    });
 }
 
 /** 根据交路查询交路区段列表*/
 export function querySectionListByRouting({ planId, routingCode }) {
-	return request({
-		url: `/api/runPlan/draft/${planId}/${routingCode}/routingSectionList`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}/${routingCode}/routingSectionList`,
+        method: 'get'
+    });
 }
 
 /** 有效性检查*/
 export function planEffectiveCheck(planId) {
-	return request({
-		url: `/api/runPlan/draft/${planId}/check`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}/check`,
+        method: 'get'
+    });
 }
 
 /** 增加计划*/
 export function addPlanService(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/service`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/service`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 删除计划*/
 export function deletePlanService(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/service/${data.serviceNumber}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/service/${data.serviceNumber}`,
+        method: 'delete'
+    });
 }
 
 /** 复制计划*/
 export function duplicateService(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/service/${data.serviceNumber}`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/service/${data.serviceNumber}`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 增加任务*/
 export function addPlanTrip(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/${data.serviceNumber}/trip`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/${data.serviceNumber}/trip`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 删除任务*/
 export function deletePlanTrip(params) {
-	return request({
-		url: `/api/runPlan/draft/${params.planId}/trip/${params.SDTNumber}`,
-		method: 'delete',
-		params: { deleteBefore: params.deleteBefore }
-	});
+    return request({
+        url: `/api/runPlan/draft/${params.planId}/trip/${params.SDTNumber}`,
+        method: 'delete',
+        params: { deleteBefore: params.deleteBefore }
+    });
 }
 
 /** 修改任务*/
 export function updatePlanTrip(data) {
-	return request({
-		url: `/api/runPlan/draft/${data.planId}/trip/${data.SDTNumber}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/draft/${data.planId}/trip/${data.SDTNumber}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 根据车次号查询交路*/
 export function getRoutingBySDTNumber(params) {
-	return request({
-		url: `/api/runPlan/draft/${params.planId}/routing`,
-		method: 'get',
-		params: {
-			SDTNumber: params.SDTNumber
-		}
-	});
+    return request({
+        url: `/api/runPlan/draft/${params.planId}/routing`,
+        method: 'get',
+        params: {
+            SDTNumber: params.SDTNumber
+        }
+    });
 }
 
 /** 运行图仿真测试*/
 export function runPlanNotify({ planId }) {
-	return request({
-		url: `/api/runPlan/draft/${planId}/simulation`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/draft/${planId}/simulation`,
+        method: 'get'
+    });
 }
 
 /** 获取运行计划模板列表*/
 export function runPlanTemplateList(params) {
-	return request({
-		url: '/api/runPlan/template',
-		method: 'get',
-		params: params
-	});
+    return request({
+        url: '/api/runPlan/template',
+        method: 'get',
+        params: params
+    });
 }
 
 /** 删除运行图模板*/
 export function deleteRunPlanTemplate(planId) {
-	return request({
-		url: `/api/runPlan/template/${planId}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/runPlan/template/${planId}`,
+        method: 'delete'
+    });
 }
 
 /** 生成通用每日运行图*/
 export function generateCommonRunPlanEveryDay(planId, params) {
-	return request({
-		url: `/api/runPlan/template/generate/${planId}`,
-		method: 'post',
-		params
-	});
+    return request({
+        url: `/api/runPlan/template/generate/${planId}`,
+        method: 'post',
+        params
+    });
 }
 
 /** 获取运行计划每日列表*/
 export function runPlanEveryDayList(params) {
-	return request({
-		url: '/api/runPlan/daily',
-		method: 'get',
-		params: params
-	});
+    return request({
+        url: '/api/runPlan/daily',
+        method: 'get',
+        params: params
+    });
 }
 
 /** 删除运行图每日计划*/
 export function deleteRunPlanEveryDay(planId) {
-	return request({
-		url: `/api/runPlan/daily/${planId}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/runPlan/daily/${planId}`,
+        method: 'delete'
+    });
 }
 
 /** 获取地图运行图的车次号*/
@@ -327,91 +317,91 @@ export function deleteRunPlanEveryDay(planId) {
 
 /** 分页查询加载计划*/
 export function getRunPlanLoadList(params) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad`,
-		method: 'get',
-		params: params
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad`,
+        method: 'get',
+        params: params
+    });
 }
 
 /** 创建加载计划*/
 export function createRunPlanLoad(data) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 管理创建通用加载计划*/
 export function createRunPlanCommon(data) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad/common`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad/common`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 删除加载计划*/
 export function deleteRunPlanLoad(planId) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad/${planId}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad/${planId}`,
+        method: 'delete'
+    });
 }
 
 /** 查询模板运行图数据*/
 export function queryRunPlanTemplate(planId) {
-	return request({
-		url: `/api/runPlan/template/${planId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/template/${planId}`,
+        method: 'get'
+    });
 }
 
 /** 查询当日运行图数据*/
 export function queryRunPlanDaily(planId) {
-	return request({
-		url: `/api/runPlan/daily/${planId}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/daily/${planId}`,
+        method: 'get'
+    });
 }
 
 /** 获取模板运行图列表*/
 export function listAllTempLateRunPlan() {
-	return request({
-		url: `/api/runPlan/template/all`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/runPlan/template/all`,
+        method: 'get'
+    });
 }
 
 // 删除加载计划
 export function deleteDailyRunPlanLoad(id) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad/${id}`,
-		method: 'DELETE'
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad/${id}`,
+        method: 'DELETE'
+    });
 }
 
 // 从加载计划创建每日计划
 export function postDailyRunPlanLoadGenerate(id) {
-	return request({
-		url: `/api/runPlan/daily/runPlanLoad/${id}/generate`,
-		method: 'post'
-	});
+    return request({
+        url: `/api/runPlan/daily/runPlanLoad/${id}/generate`,
+        method: 'post'
+    });
 }
 
 // 加载通用排班计划
 export function postSchedulingCommonGenerate(mapId) {
-	return request({
-		url: `/api/scheduling/common/generate?mapId=${mapId}`,
-		method: 'post'
-	});
+    return request({
+        url: `/api/scheduling/common/generate?mapId=${mapId}`,
+        method: 'post'
+    });
 }
 
 // 从加载计划创建每日计划
 export function postRunPlanTemplate(data) {
-	return request({
-		url: `/api/runPlan/template/${data.id}/copyAs/${data.skinCode}?name=${data.name}`,
-		method: 'post'
-	});
-}
\ No newline at end of file
+    return request({
+        url: `/api/runPlan/template/${data.id}/copyAs/${data.skinCode}?name=${data.name}`,
+        method: 'post'
+    });
+}
diff --git a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
index f9b4ff067..f43d889ec 100644
--- a/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/beijing_01/menusPlan/createTodayPlan.vue
@@ -19,127 +19,128 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-import { getStationListBySkinCode } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'ReloadTodayPlan',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				reset: true,
-				labelWidth: '100px',
-				queryObject: {
-					name: {
-						type: 'text',
-						label: '运行图名称'
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				radioShow: true,
-				columns: [
-					{
-						title: '运行图名称',
-						prop: 'name'
-					},
-					{
-						title: '皮肤类型',
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return 'success'; }
-					}
-				]
-			},
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            skinCodeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '100px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '运行图名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: '运行图名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '皮肤类型',
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                        },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	computed: {
-		title() {
-			return '加载当天计划';
-		}
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
-		},
-		doShow() {
-			this.loading = false;
-			this.dialogShow = true;
-			this.loadInitData();
-		},
-		doClose() {
-			this.dialogShow = false;
-		},
-		queryFunction(params) {
-			if (this.$store.state.map && this.$store.state.map.map) {
-				params['skinCode'] = this.$store.getters['map/skinCode'];
-			}
-			return runPlanTemplateList(params);
-		},
-		// 生成每日运行图
-		handleConfirm() {
-			if (this.$refs && this.$refs.pageRules) {
-				const choose = this.$refs.pageRules.currentChoose();
-				if (choose && choose.id) {
-					this.loading = true;
-					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-						this.loading = false;
-						this.reloadTable();
-						this.loadRunData();
-						this.doClose();
-						this.$message.success(`生成用户每日运行图成功`);
-					}).catch(() => {
-						this.loading = false;
-						this.reloadTable();
-						this.$messageBox(`生成用户每日运行图失败`);
-					});
-				} else {
-					this.$messageBox(`请选择需要加载的运行图`);
-				}
-			}
-		},
-		loadRunData() {
-			const skinCode = this.$route.query.skinCode;
-			this.$store.dispatch('runPlan/clear');
-			if (skinCode) {
-				getStationListBySkinCode(skinCode).then(response => {
-					const stations = response.data;
-					this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
-					this.$store.dispatch('runPlan/setStations', stations).then(() => {
-						getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-							this.$store.dispatch('runPlan/setPlanData', resp.data);
-						}).catch(() => {
-							this.$store.dispatch('runPlan/setPlanData', []);
-							this.$messageBox(`获取运行图数据失败`);
-						});
-					});
-				}).catch(() => {
-					this.$messageBox(`获取车站列表失败`);
-				});
-			}
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '加载当天计划';
+        }
+    },
+    methods: {
+        loadInitData() {
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
+        },
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.loadInitData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                params['skinCode'] = this.$store.getters['map/skinCode'];
+            }
+            return runPlanTemplateList(params);
+        },
+        // 生成每日运行图
+        handleConfirm() {
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose && choose.id) {
+                    this.loading = true;
+                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.loadRunData();
+                        this.doClose();
+                        this.$message.success(`生成用户每日运行图成功`);
+                    }).catch(() => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.$messageBox(`生成用户每日运行图失败`);
+                    });
+                } else {
+                    this.$messageBox(`请选择需要加载的运行图`);
+                }
+            }
+        },
+        loadRunData() {
+            const skinCode = this.$route.query.skinCode;
+            const mapId = this.$route.query.mapId;
+            this.$store.dispatch('runPlan/clear');
+            if (mapId) {
+                getStationList(mapId).then(response => {
+                    const stations = response.data;
+                    this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+                    this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                        getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+                            this.$store.dispatch('runPlan/setPlanData', resp.data);
+                        }).catch(() => {
+                            this.$store.dispatch('runPlan/setPlanData', []);
+                            this.$messageBox(`获取运行图数据失败`);
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(`获取车站列表失败`);
+                });
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
index 1eaccb114..e5ace10cb 100644
--- a/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/chengdu_03/menusPlan/createTodayPlan.vue
@@ -19,128 +19,129 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-import { getStationListBySkinCode } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'ReloadTodayPlan',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				reset: true,
-				labelWidth: '100px',
-				queryObject: {
-					name: {
-						type: 'text',
-						label: '运行图名称'
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				radioShow: true,
-				columns: [
-					{
-						title: '运行图名称',
-						prop: 'name'
-					},
-					{
-						title: '皮肤类型',
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return 'success'; }
-					}
-				]
-			},
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            skinCodeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '100px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '运行图名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: '运行图名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '皮肤类型',
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                        },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	computed: {
-		title() {
-			return '加载当天计划';
-		}
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
-		},
-		doShow() {
-			this.loading = false;
-			this.dialogShow = true;
-			this.loadInitData();
-		},
-		doClose() {
-			this.dialogShow = false;
-		},
-		queryFunction(params) {
-			if (this.$store.state.map && this.$store.state.map.map) {
-				params['skinCode'] = this.$store.getters['map/skinCode'];
-			}
-			return runPlanTemplateList(params);
-		},
-		// 生成每日运行图
-		handleConfirm() {
-			if (this.$refs && this.$refs.pageRules) {
-				const choose = this.$refs.pageRules.currentChoose();
-				if (choose && choose.id) {
-					this.loading = true;
-					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-						this.loading = false;
-						this.reloadTable();
-						this.loadRunData();
-						this.doClose();
-						this.$message.success(`生成用户每日运行图成功`);
-					}).catch((error) => {
-						console.error(error);
-						this.loading = false;
-						this.reloadTable();
-						this.$messageBox(`生成用户每日运行图失败`);
-					});
-				} else {
-					this.$messageBox(`请选择需要加载的运行图`);
-				}
-			}
-		},
-		loadRunData() {
-			const skinCode = this.$route.query.skinCode;
-			this.$store.dispatch('runPlan/clear');
-			if (skinCode) {
-				getStationListBySkinCode(skinCode).then(response => {
-					const stations = response.data;
-					this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
-					this.$store.dispatch('runPlan/setStations', stations).then(() => {
-						getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-							this.$store.dispatch('runPlan/setPlanData', resp.data);
-						}).catch(() => {
-							this.$store.dispatch('runPlan/setPlanData', []);
-							this.$messageBox(`获取运行图数据失败`);
-						});
-					});
-				}).catch(() => {
-					this.$messageBox(`获取车站列表失败`);
-				});
-			}
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '加载当天计划';
+        }
+    },
+    methods: {
+        loadInitData() {
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
+        },
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.loadInitData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                params['skinCode'] = this.$store.getters['map/skinCode'];
+            }
+            return runPlanTemplateList(params);
+        },
+        // 生成每日运行图
+        handleConfirm() {
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose && choose.id) {
+                    this.loading = true;
+                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.loadRunData();
+                        this.doClose();
+                        this.$message.success(`生成用户每日运行图成功`);
+                    }).catch((error) => {
+                        console.error(error);
+                        this.loading = false;
+                        this.reloadTable();
+                        this.$messageBox(`生成用户每日运行图失败`);
+                    });
+                } else {
+                    this.$messageBox(`请选择需要加载的运行图`);
+                }
+            }
+        },
+        loadRunData() {
+            const skinCode = this.$route.query.skinCode;
+            const mapId = this.$route.query.mapId;
+            this.$store.dispatch('runPlan/clear');
+            if (mapId) {
+                getStationList(mapId).then(response => {
+                    const stations = response.data;
+                    this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+                    this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                        getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+                            this.$store.dispatch('runPlan/setPlanData', resp.data);
+                        }).catch(() => {
+                            this.$store.dispatch('runPlan/setPlanData', []);
+                            this.$messageBox(`获取运行图数据失败`);
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(`获取车站列表失败`);
+                });
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
index f9b4ff067..f43d889ec 100644
--- a/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/chengdu_04/menusPlan/createTodayPlan.vue
@@ -19,127 +19,128 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-import { getStationListBySkinCode } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'ReloadTodayPlan',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				reset: true,
-				labelWidth: '100px',
-				queryObject: {
-					name: {
-						type: 'text',
-						label: '运行图名称'
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				radioShow: true,
-				columns: [
-					{
-						title: '运行图名称',
-						prop: 'name'
-					},
-					{
-						title: '皮肤类型',
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return 'success'; }
-					}
-				]
-			},
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            skinCodeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '100px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: '运行图名称'
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: '运行图名称',
+                        prop: 'name'
+                    },
+                    {
+                        title: '皮肤类型',
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                        },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	computed: {
-		title() {
-			return '加载当天计划';
-		}
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
-		},
-		doShow() {
-			this.loading = false;
-			this.dialogShow = true;
-			this.loadInitData();
-		},
-		doClose() {
-			this.dialogShow = false;
-		},
-		queryFunction(params) {
-			if (this.$store.state.map && this.$store.state.map.map) {
-				params['skinCode'] = this.$store.getters['map/skinCode'];
-			}
-			return runPlanTemplateList(params);
-		},
-		// 生成每日运行图
-		handleConfirm() {
-			if (this.$refs && this.$refs.pageRules) {
-				const choose = this.$refs.pageRules.currentChoose();
-				if (choose && choose.id) {
-					this.loading = true;
-					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-						this.loading = false;
-						this.reloadTable();
-						this.loadRunData();
-						this.doClose();
-						this.$message.success(`生成用户每日运行图成功`);
-					}).catch(() => {
-						this.loading = false;
-						this.reloadTable();
-						this.$messageBox(`生成用户每日运行图失败`);
-					});
-				} else {
-					this.$messageBox(`请选择需要加载的运行图`);
-				}
-			}
-		},
-		loadRunData() {
-			const skinCode = this.$route.query.skinCode;
-			this.$store.dispatch('runPlan/clear');
-			if (skinCode) {
-				getStationListBySkinCode(skinCode).then(response => {
-					const stations = response.data;
-					this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
-					this.$store.dispatch('runPlan/setStations', stations).then(() => {
-						getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-							this.$store.dispatch('runPlan/setPlanData', resp.data);
-						}).catch(() => {
-							this.$store.dispatch('runPlan/setPlanData', []);
-							this.$messageBox(`获取运行图数据失败`);
-						});
-					});
-				}).catch(() => {
-					this.$messageBox(`获取车站列表失败`);
-				});
-			}
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return '加载当天计划';
+        }
+    },
+    methods: {
+        loadInitData() {
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
+        },
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.loadInitData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                params['skinCode'] = this.$store.getters['map/skinCode'];
+            }
+            return runPlanTemplateList(params);
+        },
+        // 生成每日运行图
+        handleConfirm() {
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose && choose.id) {
+                    this.loading = true;
+                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.loadRunData();
+                        this.doClose();
+                        this.$message.success(`生成用户每日运行图成功`);
+                    }).catch(() => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.$messageBox(`生成用户每日运行图失败`);
+                    });
+                } else {
+                    this.$messageBox(`请选择需要加载的运行图`);
+                }
+            }
+        },
+        loadRunData() {
+            const skinCode = this.$route.query.skinCode;
+            const mapId = this.$route.query.mapId;
+            this.$store.dispatch('runPlan/clear');
+            if (mapId) {
+                getStationList(mapId).then(response => {
+                    const stations = response.data;
+                    this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+                    this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                        getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+                            this.$store.dispatch('runPlan/setPlanData', resp.data);
+                        }).catch(() => {
+                            this.$store.dispatch('runPlan/setPlanData', []);
+                            this.$messageBox(`获取运行图数据失败`);
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(`获取车站列表失败`);
+                });
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
index f47857639..17f4a1765 100644
--- a/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
+++ b/src/jmap/theme/fuzhou_01/menusPlan/createTodayPlan.vue
@@ -19,127 +19,128 @@
 
 <script>
 import { runPlanTemplateList } from '@/api/runplan';
-import { getStationListBySkinCode } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData, generateDayRunPlan } from '@/api/simulation';
 import { getSkinCodeList } from '@/api/management/mapskin';
 
 export default {
-	name: 'ReloadTodayPlan',
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				reset: true,
-				labelWidth: '120px',
-				queryObject: {
-					name: {
-						type: 'text',
-						label: this.$t('menu.runGraphName')
-					}
-				}
-			},
-			queryList: {
-				query: this.queryFunction,
-				selectCheckShow: false,
-				radioShow: true,
-				columns: [
-					{
-						title: this.$t('menu.runGraphName'),
-						prop: 'name'
-					},
-					{
-						title: this.$t('menu.skinType'),
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return 'success'; }
-					}
-				]
-			},
+    name: 'ReloadTodayPlan',
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            skinCodeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                reset: true,
+                labelWidth: '120px',
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: this.$t('menu.runGraphName')
+                    }
+                }
+            },
+            queryList: {
+                query: this.queryFunction,
+                selectCheckShow: false,
+                radioShow: true,
+                columns: [
+                    {
+                        title: this.$t('menu.runGraphName'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('menu.skinType'),
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                        },
+                        tagType: (row) => { return 'success'; }
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('menu.loadTheDayPlan');
-		}
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-			});
-		},
-		doShow() {
-			this.loading = false;
-			this.dialogShow = true;
-			this.loadInitData();
-		},
-		doClose() {
-			this.dialogShow = false;
-		},
-		queryFunction(params) {
-			if (this.$store.state.map && this.$store.state.map.map) {
-				params['skinCode'] = this.$store.getters['map/skinCode'];
-			}
-			return runPlanTemplateList(params);
-		},
-		// 生成每日运行图
-		handleConfirm() {
-			if (this.$refs && this.$refs.pageRules) {
-				const choose = this.$refs.pageRules.currentChoose();
-				if (choose && choose.id) {
-					this.loading = true;
-					generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
-						this.loading = false;
-						this.reloadTable();
-						this.loadRunData();
-						this.doClose();
-						this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
-					}).catch(() => {
-						this.loading = false;
-						this.reloadTable();
-						this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
-					});
-				} else {
-					this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
-				}
-			}
-		},
-		loadRunData() {
-			const skinCode = this.$route.query.skinCode;
-			this.$store.dispatch('runPlan/clear');
-			if (skinCode) {
-				getStationListBySkinCode(skinCode).then(response => {
-					const stations = response.data;
-					this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
-					this.$store.dispatch('runPlan/setStations', stations).then(() => {
-						getEveryDayRunPlanData(this.$route.query.group).then(resp => {
-							this.$store.dispatch('runPlan/setPlanData', resp.data);
-						}).catch(() => {
-							this.$store.dispatch('runPlan/setPlanData', []);
-							this.$messageBox(this.$t('error.getRunGraphDataFailed'));
-						});
-					});
-				}).catch(() => {
-					this.$messageBox(this.$t('error.getStationListFail'));
-				});
-			}
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            currentModel: {}
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('menu.loadTheDayPlan');
+        }
+    },
+    methods: {
+        loadInitData() {
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+            });
+        },
+        doShow() {
+            this.loading = false;
+            this.dialogShow = true;
+            this.loadInitData();
+        },
+        doClose() {
+            this.dialogShow = false;
+        },
+        queryFunction(params) {
+            if (this.$store.state.map && this.$store.state.map.map) {
+                params['skinCode'] = this.$store.getters['map/skinCode'];
+            }
+            return runPlanTemplateList(params);
+        },
+        // 生成每日运行图
+        handleConfirm() {
+            if (this.$refs && this.$refs.pageRules) {
+                const choose = this.$refs.pageRules.currentChoose();
+                if (choose && choose.id) {
+                    this.loading = true;
+                    generateDayRunPlan(choose.id, this.$route.query.group).then(response => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.loadRunData();
+                        this.doClose();
+                        this.$message.success(this.$t('tip.generateUserDailyRunGraphSuccessfully'));
+                    }).catch(() => {
+                        this.loading = false;
+                        this.reloadTable();
+                        this.$messageBox(this.$t('tip.generateUserDailyRunGraphFailed'));
+                    });
+                } else {
+                    this.$messageBox(this.$t('rules.selectTheRunningDiagramToBeLoaded'));
+                }
+            }
+        },
+        loadRunData() {
+            const skinCode = this.$route.query.skinCode;
+            const mapId = this.$route.query.mapId;
+            this.$store.dispatch('runPlan/clear');
+            if (mapId) {
+                getStationList(mapId).then(response => {
+                    const stations = response.data;
+                    this.PlanConvert = this.$theme.loadPlanConvert(skinCode);
+                    this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                        getEveryDayRunPlanData(this.$route.query.group).then(resp => {
+                            this.$store.dispatch('runPlan/setPlanData', resp.data);
+                        }).catch(() => {
+                            this.$store.dispatch('runPlan/setPlanData', []);
+                            this.$messageBox(this.$t('error.getRunGraphDataFailed'));
+                        });
+                    });
+                }).catch(() => {
+                    this.$messageBox(this.$t('error.getStationListFail'));
+                });
+            }
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/display/menuSchema.vue b/src/views/display/menuSchema.vue
index 795ad2701..140db13de 100644
--- a/src/views/display/menuSchema.vue
+++ b/src/views/display/menuSchema.vue
@@ -5,164 +5,164 @@
     </el-select>
 
     <el-button-group>
-		<!-- viewRunQuest -->
-	  <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{$t('display.schema.selectRoles')}}</el-button>
-      <el-button v-if="isDemon && !isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{$t('display.schema.loadScript')}}</el-button>
-      <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{$t('display.schema.previewRunDiagram')}}</el-button>
-      <el-button v-if="!runing && !isPlan && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">{{$t('display.schema.loadRunDiagram')}}</el-button>
-      <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{$t('display.schema.faultSetting')}}</el-button>
+      <!-- viewRunQuest -->
+      <el-button v-if="isDemon && isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewScriptRoles">{{ $t('display.schema.selectRoles') }}</el-button>
+      <el-button v-if="isDemon && !isDesignPlatform" size="small" :disabled="viewDisabled" type="success" @click="viewRunQuest">{{ $t('display.schema.loadScript') }}</el-button>
+      <el-button v-if="notScript && runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('display.schema.previewRunDiagram') }}</el-button>
+      <el-button v-if="!runing && !isPlan && notScript" size="small" :disabled="viewDisabled" type="warning" @click="loadRunPlan">{{ $t('display.schema.loadRunDiagram') }}</el-button>
+      <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{ $t('display.schema.faultSetting') }}</el-button>
     </el-button-group>
 
     <el-radio-group v-if="!isPlan" v-model="mode" size="small" @change="changeOperateMode(mode)">
-      <el-radio-button class="mode" :label="OperateMode.NORMAL">{{$t('display.schema.normalOperation')}}</el-radio-button>
-      <el-radio-button class="mode" :label="OperateMode.FAULT">{{$t('display.schema.faultOperation')}}</el-radio-button>
+      <el-radio-button class="mode" :label="OperateMode.NORMAL">{{ $t('display.schema.normalOperation') }}</el-radio-button>
+      <el-radio-button class="mode" :label="OperateMode.FAULT">{{ $t('display.schema.faultOperation') }}</el-radio-button>
     </el-radio-group>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { getStationListBySkinCode, queryRunPlan } from '@/api/runplan';
+import { getStationList, queryRunPlan } from '@/api/runplan';
 import { getEveryDayRunPlanData } from '@/api/simulation';
 import {getRpDetailByUserMapId} from '@/api/designPlatform';
 
 export default {
-	name: 'MenuSchema',
-	props: {
-		group: {
-			type: String,
-			required: true
-		},
-		offset: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			mode: OperateMode.NORMAL,
-			OperateMode: OperateMode,
-			viewDisabled: true,
-			runing: false,
-			swch: '02',
-			swchList: [
-				{ value: '01', name: '现地' },
-				{ value: '02', name: '行调' }
-			]
-		};
-	},
-	computed: {
-		...mapGetters('runPlan', [
-			'stations'
-		]),
-		notScript() {
-			return this.$route.params.mode !== 'script';
-		},
-		isPlan() {
-			return this.$route.params.mode === 'plan';
-		},
-		isScript() {
-			// return this.$route.params.mode === 'script';
-			return false;
-		},
-		isDemon() {
-			return this.$route.params.mode === 'demon';
-		},
-		isDesignPlatform(){
-			return this.$route.fullPath.includes('design/display/demon');
-		}
-	},
-	watch: {
-		'$store.state.training.started': function (val) {
-			this.setRuning(val);
-		},
-		'$store.state.training.switchcount': async function () {
-			if (this.group) {
-				const started = this.$store.state.training.started;
-				if (started) {
-					await this.loadRunData(this.$route.query);
-				}
-			}
-		}
-	},
-	async mounted() {
-		await this.loadRunData(this.$route.query);
-	},
-	methods: {
-		loadRunData(opt) {
-			this.$store.dispatch('runPlan/clear').then(() => {
-				if (opt && opt.skinCode) {
-					this.viewDisabled = true;
-					getStationListBySkinCode(opt.skinCode).then(response => {
-						this.$store.dispatch('runPlan/setStations', response.data).then(() => {
-							if (this.$route.params.mode == 'plan') {
-								// debugger;
-								if(this.$route.query.from=="user"){
-									// 测试运行图功能
-									getRpDetailByUserMapId(this.$route.query.planId).then(resp => {
-										this.$store.dispatch('runPlan/setPlanData', resp.data);
-										this.viewDisabled = false;
-									}).catch(() => {
-										this.$store.dispatch('runPlan/setPlanData', []);
-										this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-									});
-								}else{
-									// 测试运行图功能
-									queryRunPlan(this.$route.query.planId).then(resp => {
-										this.$store.dispatch('runPlan/setPlanData', resp.data);
-										this.viewDisabled = false;
-									}).catch(() => {
-										this.$store.dispatch('runPlan/setPlanData', []);
-										this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-									});
-								}
-								
+    name: 'MenuSchema',
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offset: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            mode: OperateMode.NORMAL,
+            OperateMode: OperateMode,
+            viewDisabled: true,
+            runing: false,
+            swch: '02',
+            swchList: [
+                { value: '01', name: '现地' },
+                { value: '02', name: '行调' }
+            ]
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        notScript() {
+            return this.$route.params.mode !== 'script';
+        },
+        isPlan() {
+            return this.$route.params.mode === 'plan';
+        },
+        isScript() {
+            // return this.$route.params.mode === 'script';
+            return false;
+        },
+        isDemon() {
+            return this.$route.params.mode === 'demon';
+        },
+        isDesignPlatform() {
+            return this.$route.fullPath.includes('design/display/demon');
+        }
+    },
+    watch: {
+        '$store.state.training.started': function (val) {
+            this.setRuning(val);
+        },
+        '$store.state.training.switchcount': async function () {
+            if (this.group) {
+                const started = this.$store.state.training.started;
+                if (started) {
+                    await this.loadRunData(this.$route.query);
+                }
+            }
+        }
+    },
+    async mounted() {
+        console.log(this.$route.query, '=====');
+        await this.loadRunData(this.$route.query);
+    },
+    methods: {
+        loadRunData(opt) {
+            this.$store.dispatch('runPlan/clear').then(() => {
+                if (opt && opt.mapId) {
+                    this.viewDisabled = true;
+                    getStationList(opt.mapId).then(response => {
+                        this.$store.dispatch('runPlan/setStations', response.data).then(() => {
+                            if (this.$route.params.mode == 'plan') {
+                                // debugger;
+                                if (this.$route.query.from == 'user') {
+                                    // 测试运行图功能
+                                    getRpDetailByUserMapId(this.$route.query.planId).then(resp => {
+                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
+                                        this.viewDisabled = false;
+                                    }).catch(() => {
+                                        this.$store.dispatch('runPlan/setPlanData', []);
+                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+                                    });
+                                } else {
+                                    // 测试运行图功能
+                                    queryRunPlan(this.$route.query.planId).then(resp => {
+                                        this.$store.dispatch('runPlan/setPlanData', resp.data);
+                                        this.viewDisabled = false;
+                                    }).catch(() => {
+                                        this.$store.dispatch('runPlan/setPlanData', []);
+                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+                                    });
+                                }
 
-							} else {
-								getEveryDayRunPlanData(this.group).then(resp => {
-									this.$store.dispatch('runPlan/setPlanData', resp.data);
-									this.viewDisabled = false;
-								}).catch(error => {
-									this.$store.dispatch('runPlan/setPlanData', []);
-									if (error.code == 30001) {
-										this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad'));
-									} else {
-										this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
-									}
-								});
-							}
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('display.schema.getStationListFail'));
-					});
-				}
-			});
-		},
-		changeOperateMode(handle) {
-			this.$store.dispatch('training/changeOperateMode', { mode: handle });
-		},
-		setRuning(run) {
-			this.runing = run;
-		},
-		setFault() {
-			this.$emit('faultChooseShow');
-		},
-		loadRunPlan() {
-			this.$emit('runPlanLoadShow');
-		},
-		viewRunPlan() {
-			this.$emit('runPlanViewShow');
-		},
-		viewRunQuest() {
-			this.$emit('runQuestLoadShow');
-		},
-		viewScriptRoles(){
-			this.$emit('runAddRolesLoadShow');
-		},
-		switchMode(swch) {
-			this.$emit('switchMode', swch);
-		}
-	}
+                            } else {
+                                getEveryDayRunPlanData(this.group).then(resp => {
+                                    this.$store.dispatch('runPlan/setPlanData', resp.data);
+                                    this.viewDisabled = false;
+                                }).catch(error => {
+                                    this.$store.dispatch('runPlan/setPlanData', []);
+                                    if (error.code == 30001) {
+                                        this.$messageBox(this.$t('display.schema.todayRunDiagramNoLoad'));
+                                    } else {
+                                        this.$messageBox(this.$t('display.schema.getRunDiagramFail'));
+                                    }
+                                });
+                            }
+                        });
+                    }).catch(() => {
+                        this.$messageBox(this.$t('display.schema.getStationListFail'));
+                    });
+                }
+            });
+        },
+        changeOperateMode(handle) {
+            this.$store.dispatch('training/changeOperateMode', { mode: handle });
+        },
+        setRuning(run) {
+            this.runing = run;
+        },
+        setFault() {
+            this.$emit('faultChooseShow');
+        },
+        loadRunPlan() {
+            this.$emit('runPlanLoadShow');
+        },
+        viewRunPlan() {
+            this.$emit('runPlanViewShow');
+        },
+        viewRunQuest() {
+            this.$emit('runQuestLoadShow');
+        },
+        viewScriptRoles() {
+            this.$emit('runAddRolesLoadShow');
+        },
+        switchMode(swch) {
+            this.$emit('switchMode', swch);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/jointTraining/menuSchema.vue b/src/views/jointTraining/menuSchema.vue
index 5f7a6fddc..0a79e4e94 100644
--- a/src/views/jointTraining/menuSchema.vue
+++ b/src/views/jointTraining/menuSchema.vue
@@ -12,14 +12,14 @@
 
     <el-button-group>
       <template>
-        <el-button v-if="runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{$t('joinTraining.runGraphPreview')}}</el-button>
+        <el-button v-if="runing" size="small" :disabled="viewDisabled" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
       </template>
       <template v-if="userRole == 'Admin'">
         <el-button v-if="!runing" size="small" type="warning" :disabled="viewDisabled" @click="loadRunPlan">
-          {{$t('joinTraining.runGraphLoading')}}</el-button>
+          {{ $t('joinTraining.runGraphLoading') }}</el-button>
       </template>
       <template v-if="userRole == 'Instructor' || userRole == 'Admin'">
-        <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{$t('joinTraining.faultSetting')}}</el-button>
+        <el-button v-if="mode==OperateMode.FAULT" size="small" type="danger" @click="setFault">{{ $t('joinTraining.faultSetting') }}</el-button>
       </template>
     </el-button-group>
 
@@ -29,121 +29,122 @@
       size="small"
       @change="changeOperateMode(mode)"
     >
-      <el-radio-button class="mode" :label="OperateMode.NORMAL">{{$t('joinTraining.normalOperation')}}</el-radio-button>
-      <el-radio-button class="mode" :label="OperateMode.FAULT">{{$t('joinTraining.faultOperation')}}</el-radio-button>
+      <el-radio-button class="mode" :label="OperateMode.NORMAL">{{ $t('joinTraining.normalOperation') }}</el-radio-button>
+      <el-radio-button class="mode" :label="OperateMode.FAULT">{{ $t('joinTraining.faultOperation') }}</el-radio-button>
     </el-radio-group>
   </div>
 </template>
 <script>
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { getStationListBySkinCode } from '@/api/runplan';
+import { getStationList } from '@/api/runplan';
 import { getEveryDayRunPlanData } from '@/api/simulation';
 
 export default {
-	name: 'MenuDemonSchema',
-	props: {
-		group: {
-			type: String,
-			required: true
-		},
-		offset: {
-			type: Number,
-			required: true
-		},
-		userRole: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			mode: OperateMode.NORMAL,
-			OperateMode: OperateMode,
-			viewDisabled: true,
-			realData: {},
-			series: [],
-			kmRangeCoordMap: {},
-			runPlanData: {},
-			swch: '02',
-			swchList: [
-				{ value: '01', name: this.$t('joinTraining.local') },
-				{ value: '02', name: this.$t('joinTraining.lineAdjustment') }
-			],
-			runing: false,
-			userId: ''
-		};
-	},
-	computed: {
-		...mapGetters('runPlan', [
-			'stations'
-		]),
-		isShowMenuBar() {
-			return this.$store.state.map.roles == 'Admin';
-		}
-	},
-	watch: {
-		'$store.state.training.started': function (val) {
-			this.setRuning(val);
-		},
-		'$store.state.training.switchcount': async function () {
-			if (this.group) {
-				const started = this.$store.state.training.started;
-				if (started) {
-					await this.loadRunData(this.$route.query);
-				}
-			}
-		}
-	},
-	async mounted() {
-		this.userId = this.$store.state.user.id;
-		await this.loadRunData(this.$route.query);
-	},
-	methods: {
-		loadRunData(opt) {
-			this.$store.dispatch('runPlan/clear').then(resp => {
-				if (opt && opt.skinCode) {
-					this.viewDisabled = true;
-					getStationListBySkinCode(opt.skinCode).then(response => {
-						const stations = response.data;
-						this.$store.dispatch('runPlan/setStations', stations).then(() => {
-							getEveryDayRunPlanData(this.group).then(resp => {
-								this.$store.dispatch('runPlan/setPlanData', resp.data);
-								this.viewDisabled = false;
-							}).catch(error => {
-								this.$store.dispatch('runPlan/setPlanData', []);
-								if (error.code == 30001) {
-									this.$messageBox(this.$t('error.runGraphIsNotLoaded'));
-								} else {
-									this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-								}
-							});
-						});
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainStationListFailed'));
-					});
-				}
-			});
-		},
-		switchMode(swch) {
-			this.$store.dispatch('training/setPrdType', swch);
-		},
-		changeOperateMode(handle) {
-			this.$store.dispatch('training/changeOperateMode', { mode: handle });
-		},
-		setFault() {
-			this.$emit('faultChooseShow');
-		},
-		loadRunPlan() {
-			this.$emit('runPlanLoadShow');
-		},
-		viewRunPlan() {
-			this.$emit('runPlanViewShow');
-		},
-		setRuning(run) {
-			this.runing = run;
-		}
-	}
+    name: 'MenuDemonSchema',
+    props: {
+        group: {
+            type: String,
+            required: true
+        },
+        offset: {
+            type: Number,
+            required: true
+        },
+        userRole: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            mode: OperateMode.NORMAL,
+            OperateMode: OperateMode,
+            viewDisabled: true,
+            realData: {},
+            series: [],
+            kmRangeCoordMap: {},
+            runPlanData: {},
+            swch: '02',
+            swchList: [
+                { value: '01', name: this.$t('joinTraining.local') },
+                { value: '02', name: this.$t('joinTraining.lineAdjustment') }
+            ],
+            runing: false,
+            userId: ''
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        isShowMenuBar() {
+            return this.$store.state.map.roles == 'Admin';
+        }
+    },
+    watch: {
+        '$store.state.training.started': function (val) {
+            this.setRuning(val);
+        },
+        '$store.state.training.switchcount': async function () {
+            if (this.group) {
+                const started = this.$store.state.training.started;
+                if (started) {
+                    await this.loadRunData(this.$route.query);
+                }
+            }
+        }
+    },
+    async mounted() {
+        this.userId = this.$store.state.user.id;
+        console.log(this.$route.query);
+        await this.loadRunData(this.$route.query);
+    },
+    methods: {
+        loadRunData(opt) {
+            this.$store.dispatch('runPlan/clear').then(resp => {
+                if (opt && opt.mapId) {
+                    this.viewDisabled = true;
+                    getStationList(opt.mapId).then(response => {
+                        const stations = response.data;
+                        this.$store.dispatch('runPlan/setStations', stations).then(() => {
+                            getEveryDayRunPlanData(this.group).then(resp => {
+                                this.$store.dispatch('runPlan/setPlanData', resp.data);
+                                this.viewDisabled = false;
+                            }).catch(error => {
+                                this.$store.dispatch('runPlan/setPlanData', []);
+                                if (error.code == 30001) {
+                                    this.$messageBox(this.$t('error.runGraphIsNotLoaded'));
+                                } else {
+                                    this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                                }
+                            });
+                        });
+                    }).catch(() => {
+                        this.$messageBox(this.$t('error.obtainStationListFailed'));
+                    });
+                }
+            });
+        },
+        switchMode(swch) {
+            this.$store.dispatch('training/setPrdType', swch);
+        },
+        changeOperateMode(handle) {
+            this.$store.dispatch('training/changeOperateMode', { mode: handle });
+        },
+        setFault() {
+            this.$emit('faultChooseShow');
+        },
+        loadRunPlan() {
+            this.$emit('runPlanLoadShow');
+        },
+        viewRunPlan() {
+            this.$emit('runPlanViewShow');
+        },
+        setRuning(run) {
+            this.runing = run;
+        }
+    }
 };
 </script>
 <style>
diff --git a/src/views/map/runplan/chart.vue b/src/views/map/runplan/chart.vue
index 7f7b1c6fa..7579cceb3 100644
--- a/src/views/map/runplan/chart.vue
+++ b/src/views/map/runplan/chart.vue
@@ -11,366 +11,366 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { getStationListBySkinCode, queryRunPlan, queryRunPlanTemplate, queryRunPlanDaily } from '@/api/runplan';
+import { getStationList, queryRunPlan, queryRunPlanTemplate, queryRunPlanDaily } from '@/api/runplan';
 import { timeFormat } from '@/utils/date';
 import { UrlConfig } from '@/router/index';
 
 export default {
-	name: 'RunPlan',
-	data() {
-		return {
-			runPlanId: 'main',
-			myChart: null,
-			PlanConvert: {},
-			option: {
-				title: {
-					text: '',
-					left: 'center'
-				},
-				grid: {
-					top: '30px',
-					left: '120px',
-					right: '2%',
-					bottom: '80px',
-					containLabel: true,
-					backgroundColor: 'floralwhite'
-				},
-				toolbox: {
-					right: '2%',
-					feature: {
-						dataZoom: {
-							yAxisIndex: 'none'
-						},
-						restore: {},
-						saveAsImage: {}
-					}
-				},
-				tooltip: {
-					axisPointer: {
-						trigger: 'item',
-						type: 'cross'
-					},
-					formatter: this.axisTooltip,
-					borderWidth: 1
-				},
-				xAxis: [
-					{
-						type: 'category',
-						boundaryGap: false,
-						data: [],
-						axisLine: {
-							onZero: false,
-							lineStyle: {
-								width: 2,
-								color: '#d14a61'
-							}
-						},
-						axisLabel: {
-							formatter: this.xAxisLableFormat,
-							textStyle: {
-								color: '#333'
-							}
-						},
-						axisPointer: {
-							snap: true,
-							label: {
-								formatter: this.xAxisPointFormat,
-								backgroundColor: 'rgb(255,0,0,0.5)',
-								color: 'white'
-							}
-						}
-					}
-				],
-				yAxis: {
-					type: 'value',
-					splitLine: {
-						show: false
-					},
-					axisTick: {
-						show: false
-					},
-					axisLine: {
-						onZero: false,
-						lineStyle: {
-							width: 2,
-							color: '#d14a61'
-						}
-					},
-					axisLabel: {
-						interval: 'auto',
-						formatter: this.yAxisLableFormat
-					},
-					axisPointer: {
-						xAxisIndex: 'all',
-						label: {
-							formatter: this.yAxisPointFormat,
-							backgroundColor: 'rgb(0,100,0,0.5)',
-							color: 'white'
-						}
-					},
-					min: 0,
-					max: 0
-				},
-				series: [],
-				dataZoom: [
-					{
-						type: 'inside'
-					},
-					{
-						fiterMode: 'filter',
-						handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
-						handleSize: '80%',
-						handleStyle: {
-							color: '#fff',
-							shadowBlur: 3,
-							shadowColor: 'rgba(0, 0, 0, 0.6)',
-							shadowOffsetX: 2,
-							shadowOffsetY: 2
-						},
-						bottom: '25px'
-					}
-				]
-			},
-			kmRangeCoordMap: {}
-		};
-	},
-	computed: {
-		...mapGetters('runPlan', [
-			'stations'
-		]),
-		isShowBack() {
-			if (this.$route.params.mode !== 'draft') {
-				return true;
-			}
-			return false;
-		},
-		mode() {
-			return this.$route.params.mode;
-		},
-		width() {
-			return this.$store.state.app.width;
-		},
-		height() {
-			return this.$store.state.app.height;
-		}
-	},
-	watch: {
-		'$store.state.runPlan.planSizeCount': function () {
-			this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
-		},
-		'$store.state.app.windowSizeCount': function() {
-			this.setPlanSize();
-		},
-		$route() {
-			this.$nextTick(() => {
-				this.loadChartPage(this.$route.query);
-			});
-		}
-	},
-	mounted() {
-		this.setPlanSize();
-		this.loadChartPage(this.$route.query);
-	},
-	beforeDestroy() {
-		this.destroy();
-	},
-	methods: {
-		loadChartPage(opt) {
-			this.PlanConvert = this.$theme.loadPlanConvert(opt.skinCode);
-			this.$store.dispatch('runPlan/clear').then(resp => {
-				this.loadInitChart().then(() => {
-					if (opt.skinCode && opt.planId) {
-						this.myChart && this.myChart.showLoading();
-						getStationListBySkinCode(opt.skinCode).then(response => {
-							this.$store.dispatch('runPlan/setStations', response.data).then(() => {
-								let queryFunc = null;
-								const params = opt.planId;
+    name: 'RunPlan',
+    data() {
+        return {
+            runPlanId: 'main',
+            myChart: null,
+            PlanConvert: {},
+            option: {
+                title: {
+                    text: '',
+                    left: 'center'
+                },
+                grid: {
+                    top: '30px',
+                    left: '120px',
+                    right: '2%',
+                    bottom: '80px',
+                    containLabel: true,
+                    backgroundColor: 'floralwhite'
+                },
+                toolbox: {
+                    right: '2%',
+                    feature: {
+                        dataZoom: {
+                            yAxisIndex: 'none'
+                        },
+                        restore: {},
+                        saveAsImage: {}
+                    }
+                },
+                tooltip: {
+                    axisPointer: {
+                        trigger: 'item',
+                        type: 'cross'
+                    },
+                    formatter: this.axisTooltip,
+                    borderWidth: 1
+                },
+                xAxis: [
+                    {
+                        type: 'category',
+                        boundaryGap: false,
+                        data: [],
+                        axisLine: {
+                            onZero: false,
+                            lineStyle: {
+                                width: 2,
+                                color: '#d14a61'
+                            }
+                        },
+                        axisLabel: {
+                            formatter: this.xAxisLableFormat,
+                            textStyle: {
+                                color: '#333'
+                            }
+                        },
+                        axisPointer: {
+                            snap: true,
+                            label: {
+                                formatter: this.xAxisPointFormat,
+                                backgroundColor: 'rgb(255,0,0,0.5)',
+                                color: 'white'
+                            }
+                        }
+                    }
+                ],
+                yAxis: {
+                    type: 'value',
+                    splitLine: {
+                        show: false
+                    },
+                    axisTick: {
+                        show: false
+                    },
+                    axisLine: {
+                        onZero: false,
+                        lineStyle: {
+                            width: 2,
+                            color: '#d14a61'
+                        }
+                    },
+                    axisLabel: {
+                        interval: 'auto',
+                        formatter: this.yAxisLableFormat
+                    },
+                    axisPointer: {
+                        xAxisIndex: 'all',
+                        label: {
+                            formatter: this.yAxisPointFormat,
+                            backgroundColor: 'rgb(0,100,0,0.5)',
+                            color: 'white'
+                        }
+                    },
+                    min: 0,
+                    max: 0
+                },
+                series: [],
+                dataZoom: [
+                    {
+                        type: 'inside'
+                    },
+                    {
+                        fiterMode: 'filter',
+                        handleIcon: 'M10.7,11.9v-1.3H9.3v1.3c-4.9,0.3-8.8,4.4-8.8,9.4c0,5,3.9,9.1,8.8,9.4v1.3h1.3v-1.3c4.9-0.3,8.8-4.4,8.8-9.4C19.5,16.3,15.6,12.2,10.7,11.9z M13.3,24.4H6.7V23h6.6V24.4z M13.3,19.6H6.7v-1.4h6.6V19.6z',
+                        handleSize: '80%',
+                        handleStyle: {
+                            color: '#fff',
+                            shadowBlur: 3,
+                            shadowColor: 'rgba(0, 0, 0, 0.6)',
+                            shadowOffsetX: 2,
+                            shadowOffsetY: 2
+                        },
+                        bottom: '25px'
+                    }
+                ]
+            },
+            kmRangeCoordMap: {}
+        };
+    },
+    computed: {
+        ...mapGetters('runPlan', [
+            'stations'
+        ]),
+        isShowBack() {
+            if (this.$route.params.mode !== 'draft') {
+                return true;
+            }
+            return false;
+        },
+        mode() {
+            return this.$route.params.mode;
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    watch: {
+        '$store.state.runPlan.planSizeCount': function () {
+            this.reSize({ width: this.$store.state.runPlan.width, height: this.$store.state.runPlan.height });
+        },
+        '$store.state.app.windowSizeCount': function() {
+            this.setPlanSize();
+        },
+        $route() {
+            this.$nextTick(() => {
+                this.loadChartPage(this.$route.query);
+            });
+        }
+    },
+    mounted() {
+        this.setPlanSize();
+        this.loadChartPage(this.$route.query);
+    },
+    beforeDestroy() {
+        this.destroy();
+    },
+    methods: {
+        loadChartPage(opt) {
+            this.PlanConvert = this.$theme.loadPlanConvert(opt.skinCode);
+            this.$store.dispatch('runPlan/clear').then(resp => {
+                this.loadInitChart().then(() => {
+                    if (opt.mapId && opt.planId) {
+                        this.myChart && this.myChart.showLoading();
+                        getStationList(opt.mapId).then(response => {
+                            this.$store.dispatch('runPlan/setStations', response.data).then(() => {
+                                let queryFunc = null;
+                                const params = opt.planId;
 
-								switch (this.mode) {
-								case 'common': queryFunc = queryRunPlanTemplate; break;
-								case 'template': queryFunc = queryRunPlanTemplate; break;
-								case 'everyDay': queryFunc = queryRunPlanDaily; break;
-								default: queryFunc = queryRunPlan; break;
-								}
+                                switch (this.mode) {
+                                case 'common': queryFunc = queryRunPlanTemplate; break;
+                                case 'template': queryFunc = queryRunPlanTemplate; break;
+                                case 'everyDay': queryFunc = queryRunPlanDaily; break;
+                                default: queryFunc = queryRunPlan; break;
+                                }
 
-								queryFunc(params).then(resp => {
-									this.loadChartData(resp.data);
-									this.myChart && this.myChart.hideLoading();
-								}).catch(() => {
-									this.myChart && this.myChart.hideLoading();
-									this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
-								});
-							});
-						}).catch(() => {
-							this.myChart && this.myChart.hideLoading();
-							this.$messageBox(this.$t('error.obtainStationListFailed'));
-						});
-					}
-				});
-			});
-		},
-		async loadChartData(data) {
-			try {
-				this.option.title.text = data.planName;
-				this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(this.stations);
-				this.option.series = [];
-				this.pushModels(this.option.series, [this.PlanConvert.initializeYaxis(this.stations)]);
-				this.pushModels(this.option.series, this.PlanConvert.convertDataToModels(data, this.stations, this.kmRangeCoordMap, { width: 1 }));
-				this.loadInitData();
-			} catch (error) {
-				this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
-			}
-		},
-		async loadInitData() {
-			await this.xAxisInit();
-			await this.yAxisInit();
-			await this.loadInitChart();
-		},
-		xAxisPointFormat(params) {
-			return timeFormat(params.value);
-		},
-		yAxisPointFormat(params) {
-			return this.PlanConvert.computedFormatYAxis(this.stations, params);
-		},
-		xAxisLableFormat(value, index) {
-			if (value % 60 === 0) {
-				return timeFormat(parseInt(value));
-			}
-		},
-		yAxisLableFormat(value, index) {
-			return '';
-		},
-		xAxisInit() {
-			const list = [];
-			for (var time = this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
-				list.push(time);
-			}
-			this.option.xAxis[0].data = list;
-			this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = 3600 * 6 - 600 + this.PlanConvert.TranslationTime;
-			this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = 3600 * 8 + 600 + this.PlanConvert.TranslationTime;
-		},
-		yAxisInit() {
-			if (Object.keys(this.PlanConvert).length) {
-				this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-				this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
-			}
-		},
-		pushModels(series, models) {
-			if (models && models.length) {
-				models.forEach(elem => {
-					if (elem) {
-						series.push(elem);
-					}
-				});
-			}
-			return series;
-		},
-		popModels(series, models) {
-			if (models && models.length) {
-				models.forEach(elem => {
-					const index = series.indexOf(elem);
-					if (index >= 0) {
-						series.split(index, 1);
-					}
-				});
-			}
-			return series;
-		},
-		loadInitChart() {
-			return new Promise((resolve, reject) => {
-				try {
-					const that = this;
-					// 加载echart配置
-					require.config(
-						{
-							paths: {
-								echarts: './js/dist'
-							}
-						}
-					);
-					// 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
-					require(
-						[
-							'echarts',
-							'echarts/lib/chart/line'
-						],
-						function (ec) {
-							if (that.myChart && that.myChart.isDisposed) {
-								that.myChart.clear();
-							}
-							that.myChart = ec.init(document.getElementById(that.runPlanId));
-							that.myChart.setOption(that.option);
-							that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
-							// that.myChart.on('click', that.mouseClick);
-							resolve(true);
-						}
-					);
-				} catch (error) {
-					reject(error);
-				}
-			});
-		},
-		axisTooltip(param) {
-			if (param.data[1] >= this.option.yAxis.min + this.PlanConvert.EdgeHeight && param.data[1] <= this.option.yAxis.max - this.PlanConvert.EdgeHeight) {
-				const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
-				return [
-					`Point Data <hr size=1 style="margin: 3px 0">`,
-					`${this.$t('map.stationName')}: ${station.name}<br>`,
-					`${this.$t('map.stationKilometerMark')}: ${station.kmRange} km <br>`,
-					`${this.$t('map.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
-				].join('');
-			}
-		},
-		mouseClick(params) {
-		},
-		settingExac(data) {
-			this.myChart && this.myChart.setOption({
-				xAxis: this.option.xAxis,
-				yAxis: this.option.yAxis
-			});
+                                queryFunc(params).then(resp => {
+                                    this.loadChartData(resp.data);
+                                    this.myChart && this.myChart.hideLoading();
+                                }).catch(() => {
+                                    this.myChart && this.myChart.hideLoading();
+                                    this.$messageBox(this.$t('error.obtainOperationGraphFailed'));
+                                });
+                            });
+                        }).catch(() => {
+                            this.myChart && this.myChart.hideLoading();
+                            this.$messageBox(this.$t('error.obtainStationListFailed'));
+                        });
+                    }
+                });
+            });
+        },
+        async loadChartData(data) {
+            try {
+                this.option.title.text = data.planName;
+                this.kmRangeCoordMap = this.PlanConvert.convertStationsToMap(this.stations);
+                this.option.series = [];
+                this.pushModels(this.option.series, [this.PlanConvert.initializeYaxis(this.stations)]);
+                this.pushModels(this.option.series, this.PlanConvert.convertDataToModels(data, this.stations, this.kmRangeCoordMap, { width: 1 }));
+                this.loadInitData();
+            } catch (error) {
+                this.$messageBox(this.$t('error.loadingOperationGraphFailed'));
+            }
+        },
+        async loadInitData() {
+            await this.xAxisInit();
+            await this.yAxisInit();
+            await this.loadInitChart();
+        },
+        xAxisPointFormat(params) {
+            return timeFormat(params.value);
+        },
+        yAxisPointFormat(params) {
+            return this.PlanConvert.computedFormatYAxis(this.stations, params);
+        },
+        xAxisLableFormat(value, index) {
+            if (value % 60 === 0) {
+                return timeFormat(parseInt(value));
+            }
+        },
+        yAxisLableFormat(value, index) {
+            return '';
+        },
+        xAxisInit() {
+            const list = [];
+            for (var time = this.PlanConvert.TranslationTime; time < 3600 * 24 + this.PlanConvert.TranslationTime; time++) {
+                list.push(time);
+            }
+            this.option.xAxis[0].data = list;
+            this.option.dataZoom[0].startValue = this.option.dataZoom[1].startValue = 3600 * 6 - 600 + this.PlanConvert.TranslationTime;
+            this.option.dataZoom[0].endValue = this.option.dataZoom[1].endValue = 3600 * 8 + 600 + this.PlanConvert.TranslationTime;
+        },
+        yAxisInit() {
+            if (Object.keys(this.PlanConvert).length) {
+                this.option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
+                this.option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+            }
+        },
+        pushModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    if (elem) {
+                        series.push(elem);
+                    }
+                });
+            }
+            return series;
+        },
+        popModels(series, models) {
+            if (models && models.length) {
+                models.forEach(elem => {
+                    const index = series.indexOf(elem);
+                    if (index >= 0) {
+                        series.split(index, 1);
+                    }
+                });
+            }
+            return series;
+        },
+        loadInitChart() {
+            return new Promise((resolve, reject) => {
+                try {
+                    const that = this;
+                    // 加载echart配置
+                    require.config(
+                        {
+                            paths: {
+                                echarts: './js/dist'
+                            }
+                        }
+                    );
+                    // 按需加载所需图表，如需动态类型切换功能，别忘了同时加载相应图表
+                    require(
+                        [
+                            'echarts',
+                            'echarts/lib/chart/line'
+                        ],
+                        function (ec) {
+                            if (that.myChart && that.myChart.isDisposed) {
+                                that.myChart.clear();
+                            }
+                            that.myChart = ec.init(document.getElementById(that.runPlanId));
+                            that.myChart.setOption(that.option);
+                            that.reSize({ width: that.$store.state.runPlan.width, height: that.$store.state.runPlan.height });
+                            // that.myChart.on('click', that.mouseClick);
+                            resolve(true);
+                        }
+                    );
+                } catch (error) {
+                    reject(error);
+                }
+            });
+        },
+        axisTooltip(param) {
+            if (param.data[1] >= this.option.yAxis.min + this.PlanConvert.EdgeHeight && param.data[1] <= this.option.yAxis.max - this.PlanConvert.EdgeHeight) {
+                const station = this.stations[Math.floor((param.data[1] - this.PlanConvert.EdgeHeight) / this.PlanConvert.CoordMultiple)] || { name: '', kmRange: '' };
+                return [
+                    `Point Data <hr size=1 style="margin: 3px 0">`,
+                    `${this.$t('map.stationName')}: ${station.name}<br>`,
+                    `${this.$t('map.stationKilometerMark')}: ${station.kmRange} km <br>`,
+                    `${this.$t('map.arrivalTime')}: ${timeFormat(param.data[0] + this.PlanConvert.TranslationTime)} (${param.data[0]})<br>`
+                ].join('');
+            }
+        },
+        mouseClick(params) {
+        },
+        settingExac(data) {
+            this.myChart && this.myChart.setOption({
+                xAxis: this.option.xAxis,
+                yAxis: this.option.yAxis
+            });
 
-			this.myChart && this.myChart.dispatchAction({
-				type: 'dataZoom',
-				dataZoomIndex: [0, 1],
-				startValue: parseInt(data.startValue / 1000),
-				endValue: parseInt(data.endValue / 1000)
-			});
-		},
-		reSize(opt) {
-			if (this.myChart) {
-				this.myChart.resize({
-					width: opt.width,
-					height: opt.height,
-					silent: false
-				});
-			}
-		},
-		setPlanSize() {
-			this.$nextTick(() => {
-				if (this.mode !== 'draft') {
-					this.$store.dispatch('runPlan/resize', { width: this.width, height: this.height - 130 });
-				} else {
-					this.$store.dispatch('runPlan/resize', { width: this.$store.state.runPlan.width, height: this.height - 60 });
-				}
-			});
-		},
-		destroy() {
-			if (this.myChart && this.myChart.isDisposed) {
-				this.myChart.dispose();
-				this.myChart = null;
-			}
-		},
-		back() {
-			if (this.$route.params.mode === 'everyDay') {
-				this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` });
-			} else if (this.$route.params.mode === 'template') {
-				this.$router.replace({ path: `${UrlConfig.publish.runPlanTemplate}` });
-			} else if (this.$route.params.mode === 'common') {
-				this.$router.replace({ path: `${UrlConfig.publish.runPlanCommon}` });
-			} else {
-				this.$router.go(-1);
-			}
-		}
-	}
+            this.myChart && this.myChart.dispatchAction({
+                type: 'dataZoom',
+                dataZoomIndex: [0, 1],
+                startValue: parseInt(data.startValue / 1000),
+                endValue: parseInt(data.endValue / 1000)
+            });
+        },
+        reSize(opt) {
+            if (this.myChart) {
+                this.myChart.resize({
+                    width: opt.width,
+                    height: opt.height,
+                    silent: false
+                });
+            }
+        },
+        setPlanSize() {
+            this.$nextTick(() => {
+                if (this.mode !== 'draft') {
+                    this.$store.dispatch('runPlan/resize', { width: this.width, height: this.height - 130 });
+                } else {
+                    this.$store.dispatch('runPlan/resize', { width: this.$store.state.runPlan.width, height: this.height - 60 });
+                }
+            });
+        },
+        destroy() {
+            if (this.myChart && this.myChart.isDisposed) {
+                this.myChart.dispose();
+                this.myChart = null;
+            }
+        },
+        back() {
+            if (this.$route.params.mode === 'everyDay') {
+                this.$router.replace({ path: `${UrlConfig.publish.runPlanEveryDay}` });
+            } else if (this.$route.params.mode === 'template') {
+                this.$router.replace({ path: `${UrlConfig.publish.runPlanTemplate}` });
+            } else if (this.$route.params.mode === 'common') {
+                this.$router.replace({ path: `${UrlConfig.publish.runPlanCommon}` });
+            } else {
+                this.$router.go(-1);
+            }
+        }
+    }
 };
 </script>
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index e4d87c974..9fb789b18 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -25,7 +25,7 @@
 <script>
 import { mapGetters } from 'vuex';
 import { timeFormat } from '@/utils/date';
-import { getStationListBySkinCode, queryRunPlan } from '@/api/runplan';
+import { getStationList, queryRunPlan } from '@/api/runplan';
 import {getRpDetailByUserMapId, getUserMapDetailByMapId} from '@/api/designPlatform';
 import { loadMapDataById } from '@/utils/loaddata';
 import { getPublishMapInfo } from '@/api/jmap/map';
@@ -372,7 +372,7 @@ export default {
                     this.loadInitChart().then(() => {
                         if (this.$route.query.mapId) {
                             loadMapDataById(this.$route.query.mapId);
-                            getStationListBySkinCode(this.$route.query.skinCode).then(resp => {
+                            getStationList(this.$route.query.mapId).then(resp => {
                                 this.$store.dispatch('runPlan/setStations', resp.data).then(() => {
                                     this.loadInitData();
                                     if (this.planId) {
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 9e079cc97..62f32f8b0 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -15,174 +15,174 @@ import MapSelect from './mapSelect';
 import CopyPlan from './copyPlan.vue';
 
 export default {
-	name: 'RunPlanTemplate',
-	components: {
-		MapSelect,
-		CopyPlan
-	},
-	data() {
-		return {
-			skinCodeList: [],
-			pagerConfig: {
-				pageSize: 'pageSize',
-				pageIndex: 'pageNum'
-			},
-			queryForm: {
-				labelWidth: '140px',
-				reset: true,
-				queryObject: {
-					name: {
-						type: 'text',
-						label: this.$t('publish.runPlanName')
-					},
-					skinCode: {
-						type: 'select',
-						label: this.$t('publish.skinType'),
-						config: {
-							data: []
-						}
-					}
-				}
-			},
-			queryList: {
-				query: runPlanTemplateList,
-				selectCheckShow: false,
-				indexShow: true,
-				columns: [
-					{
-						title: this.$t('publish.runPlanName'),
-						prop: 'name'
-					},
-					{
-						title: this.$t('publish.skinType'),
-						prop: 'skinCode',
-						type: 'tag',
-						columnValue: (row) => {
-							return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
-						},
-						tagType: (row) => { return ''; }
-					},
-					{
-						title: this.$t('publish.createTime'),
-						prop: 'createTime'
-					},
-					{
-						type: 'button',
-						title: this.$t('global.operate'),
-						width: '450',
-						hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
-						buttons: [
-							{
-								name: this.$t('global.delete'),
-								handleClick: this.handleDelete,
-								type: 'danger'
-							},
-							{
-								name: this.$t('publish.generateRunPlan'),
-								handleClick: this.handleMapSelect,
-								type: ''
-							},
-							{
-								name: this.$t('publish.copyRunPlan'),
-								handleClick: this.handleCopyPlan,
-								type: ''
-							},
-							{
-								name: this.$t('global.preview'),
-								handleClick: this.handleView,
-								type: ''
-							}
-						]
-					}
-				]
-			},
+    name: 'RunPlanTemplate',
+    components: {
+        MapSelect,
+        CopyPlan
+    },
+    data() {
+        return {
+            skinCodeList: [],
+            pagerConfig: {
+                pageSize: 'pageSize',
+                pageIndex: 'pageNum'
+            },
+            queryForm: {
+                labelWidth: '140px',
+                reset: true,
+                queryObject: {
+                    name: {
+                        type: 'text',
+                        label: this.$t('publish.runPlanName')
+                    },
+                    skinCode: {
+                        type: 'select',
+                        label: this.$t('publish.skinType'),
+                        config: {
+                            data: []
+                        }
+                    }
+                }
+            },
+            queryList: {
+                query: runPlanTemplateList,
+                selectCheckShow: false,
+                indexShow: true,
+                columns: [
+                    {
+                        title: this.$t('publish.runPlanName'),
+                        prop: 'name'
+                    },
+                    {
+                        title: this.$t('publish.skinType'),
+                        prop: 'skinCode',
+                        type: 'tag',
+                        columnValue: (row) => {
+                            return this.$convertField(row.skinCode, this.skinCodeList, ['code', 'name']);
+                        },
+                        tagType: (row) => { return ''; }
+                    },
+                    {
+                        title: this.$t('publish.createTime'),
+                        prop: 'createTime'
+                    },
+                    {
+                        type: 'button',
+                        title: this.$t('global.operate'),
+                        width: '450',
+                        hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
+                        buttons: [
+                            {
+                                name: this.$t('global.delete'),
+                                handleClick: this.handleDelete,
+                                type: 'danger'
+                            },
+                            {
+                                name: this.$t('publish.generateRunPlan'),
+                                handleClick: this.handleMapSelect,
+                                type: ''
+                            },
+                            {
+                                name: this.$t('publish.copyRunPlan'),
+                                handleClick: this.handleCopyPlan,
+                                type: ''
+                            },
+                            {
+                                name: this.$t('global.preview'),
+                                handleClick: this.handleView,
+                                type: ''
+                            }
+                        ]
+                    }
+                ]
+            },
 
-			currentModel: {}
-		};
-	},
-	created() {
-		this.loadInitData();
-	},
-	methods: {
-		loadInitData() {
-			this.skinCodeList = [];
-			getSkinCodeList().then(response => {
-				this.skinCodeList = response.data;
-				response.data.forEach(elem => {
-					this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
-				});
-			});
-		},
-		// 删除
-		handleDelete(index, row) {
-			this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				deleteRunPlanTemplate(row.id).then(response => {
-					this.$message.success(this.$t('publish.deleteSuccess'));
-					this.reloadTable();
-				}).catch(error => {
-					this.reloadTable();
-					if (error.code == 500) {
-						this.$messageBox(this.$t('error.deleteFailed'));
-					} else if (error.code == 500009) {
-						this.$messageBox(this.$t('error.templateHasBeUse'));
-					}
-				});
-			}).catch(() => { });
-		},
-		// 选择皮肤关联的地图
-		handleMapSelect(index, row) {
-			this.$refs.map.doShow(row);
-		},
-		// 复制运行图
-		handleCopyPlan(index, row) {
-			this.$refs.copyPlan.doShow(row);
-		},
-		// 生成每日运行图
-		handleGenerateEveryDay({planId, mapId}) {
-			this.$confirm(this.$t('publish.wellGenerateEveryRunPlan'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				generateCommonRunPlanEveryDay(planId, {mapId}).then(response => {
-					this.reloadTable();
-					this.$refs.map.doClose();
-					this.$message.success(this.$t('publish.createCommonSuccess'));
-				}).catch(() => {
-					this.reloadTable();
-					this.$messageBox(this.$t('error.operationFailure'));
-				});
-			}).catch(() => { });
-		},
-		// 生成复制的运行图
-		handleCopyRunPlan(data) {
-			this.$confirm(this.$t('publish.copyRunPlanContinue'), this.$t('global.tips'), {
-				confirmButtonText: this.$t('global.confirm'),
-				cancelButtonText: this.$t('global.cancel'),
-				type: 'warning'
-			}).then(() => {
-				postRunPlanTemplate({ id: data.id, skinCode: data.skinCode, name: data.name }).then(response => {
-					this.reloadTable();
-					this.$refs.copyPlan.doClose();
-					this.$message.success(this.$t('publish.createCommonSuccess'));
-				}).catch(() => {
-					this.reloadTable();
-					this.$messageBox(this.$t('error.operationFailure'));
-				});
-			}).catch(() => { });
-		},
-		// 预览
-		handleView(index, row) {
-			this.$router.push({ path: `${UrlConfig.publish.runPlanView}/template`, query: { skinCode: row.skinCode, planId: row.id } });
-		},
-		reloadTable() {
-			this.queryList.reload();
-		}
-	}
+            currentModel: {}
+        };
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods: {
+        loadInitData() {
+            this.skinCodeList = [];
+            getSkinCodeList().then(response => {
+                this.skinCodeList = response.data;
+                response.data.forEach(elem => {
+                    this.queryForm.queryObject.skinCode.config.data.push({ value: elem.code, label: elem.name });
+                });
+            });
+        },
+        // 删除
+        handleDelete(index, row) {
+            this.$confirm(this.$t('publish.wellDelTemplate'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                deleteRunPlanTemplate(row.id).then(response => {
+                    this.$message.success(this.$t('publish.deleteSuccess'));
+                    this.reloadTable();
+                }).catch(error => {
+                    this.reloadTable();
+                    if (error.code == 500) {
+                        this.$messageBox(this.$t('error.deleteFailed'));
+                    } else if (error.code == 500009) {
+                        this.$messageBox(this.$t('error.templateHasBeUse'));
+                    }
+                });
+            }).catch(() => { });
+        },
+        // 选择皮肤关联的地图
+        handleMapSelect(index, row) {
+            this.$refs.map.doShow(row);
+        },
+        // 复制运行图
+        handleCopyPlan(index, row) {
+            this.$refs.copyPlan.doShow(row);
+        },
+        // 生成每日运行图
+        handleGenerateEveryDay({planId, mapId}) {
+            this.$confirm(this.$t('publish.wellGenerateEveryRunPlan'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                generateCommonRunPlanEveryDay(planId, {mapId}).then(response => {
+                    this.reloadTable();
+                    this.$refs.map.doClose();
+                    this.$message.success(this.$t('publish.createCommonSuccess'));
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.operationFailure'));
+                });
+            }).catch(() => { });
+        },
+        // 生成复制的运行图
+        handleCopyRunPlan(data) {
+            this.$confirm(this.$t('publish.copyRunPlanContinue'), this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                postRunPlanTemplate({ id: data.id, skinCode: data.skinCode, name: data.name }).then(response => {
+                    this.reloadTable();
+                    this.$refs.copyPlan.doClose();
+                    this.$message.success(this.$t('publish.createCommonSuccess'));
+                }).catch(() => {
+                    this.reloadTable();
+                    this.$messageBox(this.$t('error.operationFailure'));
+                });
+            }).catch(() => { });
+        },
+        // 预览
+        handleView(index, row) {
+            this.$router.push({ path: `${UrlConfig.publish.runPlanView}/template`, query: { skinCode: row.skinCode, planId: row.id, mapId: row.mapId } });
+        },
+        reloadTable() {
+            this.queryList.reload();
+        }
+    }
 };
 </script>
 <style lang="scss" scoped>

From f2e4885f7871db7396fcbf23d7f2d49c0afc84b4 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 16:58:44 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/runPlan/draft/tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/runplan.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/api/runplan.js b/src/api/runplan.js
index 876381619..04ad4baa2 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -1,15 +1,5 @@
 import request from '@/utils/request';
 
-/**
- * 获取运行图列表
- */
-export function getRunPlanList() {
-    return request({
-        url: '/api/runPlan/draft/tree',
-        method: 'get'
-    });
-}
-
 /**
  * 获取地图速度等级列表
  */

From 0f778f94c68571fe02e1d881683debbbf450ddec Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 17:00:50 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E6=89=80=E6=9C=89=20/api/mapSkin=20?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=83=BD=E6=94=B9=E4=B8=BA=20=20/api/realLine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/mapskin.js | 72 +++++++++++++++++------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/api/management/mapskin.js b/src/api/management/mapskin.js
index 7ca93831d..1eba6fd9a 100644
--- a/src/api/management/mapskin.js
+++ b/src/api/management/mapskin.js
@@ -2,68 +2,68 @@ import request from '@/utils/request';
 
 /** 分页查询皮肤*/
 export function getSkinCodePageList(params) {
-	return request({
-		url: `/api/mapSkin`,
-		method: 'get',
-		params: params
-	});
+    return request({
+        url: `/api/realLine`,
+        method: 'get',
+        params: params
+    });
 }
 
 /** 添加皮肤*/
 export function addSkinCode(data) {
-	return request({
-		url: `/api/mapSkin`,
-		method: 'post',
-		data: data
-	});
+    return request({
+        url: `/api/realLine`,
+        method: 'post',
+        data: data
+    });
 }
 
 /** 删除皮肤*/
 export function delSkinCode(id) {
-	return request({
-		url: `/api/mapSkin/${id}`,
-		method: 'delete'
-	});
+    return request({
+        url: `/api/realLine/${id}`,
+        method: 'delete'
+    });
 }
 
 /** 查询地图皮肤 */
 export function querySkinCode(id) {
-	return request({
-		url: `/api/mapSkin/${id}`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/realLine/${id}`,
+        method: 'get'
+    });
 }
 
 /** 修改地图皮肤*/
 export function updateSkinCode(data) {
-	return request({
-		url: `/api/mapSkin/${data.id}`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/realLine/${data.id}`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 通过皮肤Code更新地图皮肤*/
 export function updateSkinCodeByCode(data) {
-	return request({
-		url: `/api/mapSkin/${data.code}/update`,
-		method: 'put',
-		data: data
-	});
+    return request({
+        url: `/api/realLine/${data.code}/update`,
+        method: 'put',
+        data: data
+    });
 }
 
 /** 查询皮肤是否存在*/
 export function querySkinCodeExistByCode(code) {
-	return request({
-		url: `/api/mapSkin/${code}/exist`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/realLine/${code}/exist`,
+        method: 'get'
+    });
 }
 
 /** 获取皮肤列表*/
 export function getSkinCodeList() {
-	return request({
-		url: `/api/mapSkin/list`,
-		method: 'get'
-	});
+    return request({
+        url: `/api/realLine/list`,
+        method: 'get'
+    });
 }

From 36c33ed41624df810791aef0624b4d8d735a52d7 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 17:21:32 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/runPlan/template/skin/{mapId}=20=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20=20/api/runPlan/template/{mapId}/list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/runplan.js                            |   4 +-
 src/views/planMonitor/detail.vue              | 400 +++++++++---------
 .../editTool/menus/createEmptyPlan.vue        | 376 ++++++++--------
 src/views/planMonitor/home.vue                |  32 +-
 src/views/planMonitor/index.vue               |  64 +--
 5 files changed, 439 insertions(+), 437 deletions(-)

diff --git a/src/api/runplan.js b/src/api/runplan.js
index 04ad4baa2..195246199 100644
--- a/src/api/runplan.js
+++ b/src/api/runplan.js
@@ -53,9 +53,9 @@ export function queryRunPlan(planId) {
 }
 
 // 根据skinCode查询发布运行图列表
-export function queryRunPlanList(skinCode) {
+export function queryRunPlanList(mapId) {
     return request({
-        url: `/api/runPlan/template/skin/${skinCode}`,
+        url: `/api/runPlan/template/${mapId}/list`,
         method: 'get'
     });
 }
diff --git a/src/views/planMonitor/detail.vue b/src/views/planMonitor/detail.vue
index 0d4e83ce3..0d9a03b2f 100644
--- a/src/views/planMonitor/detail.vue
+++ b/src/views/planMonitor/detail.vue
@@ -1,43 +1,47 @@
 <template>
   <el-card :style="{height: height+'px'}" style="overflow-y:scroll;padding-bottom:20px;">
-	<div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
-		<div class="runPlanList">{{$t('planMonitor.openRunPlan.runPlanList')}}</div>
-		<el-button size="small" type="primary" @click="handleCreate" class="createRunPlan" v-if="isCreate">{{$t('planMonitor.createRunningDiagram')}}</el-button>
-	</div>
-	<el-table :data="runPlanList" height="500" stripe
-        border
-		style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
-        <el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
-        <el-table-column :label="this.$t('global.status')" v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))">
-            <template slot-scope="scope">
-                <el-tag>{{handlerStatus(scope.row)}}</el-tag>
-            </template>
-        </el-table-column>
-        <el-table-column
-            prop="explanation"
-            show-overflow-tooltip
-			v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))"
-            :label="this.$t('planMonitor.explanation')">
-        </el-table-column>
-        <el-table-column :label="this.$t('planMonitor.creationDate')">
-            <template slot-scope="scope">
-                <el-tag type="success">{{handleTime(scope.row.createTime)}}</el-tag>
-            </template>
-        </el-table-column>
-        <el-table-column :label="this.$t('global.operate')"  width="400">
-          <template slot-scope="scope">
-            <el-button size="mini" class="button_box" type="success" @click="handleConfirm(scope.row)" v-if="scope.row.status !=='1'">{{$t('planMonitor.load')}}</el-button>
-            <el-button size="mini" class="button_box" type="primary" @click="handleEdit(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('planMonitor.modifyName')}}</el-button>
-            <el-button size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)" v-if="isCreate && scope.row.status !=='1'">{{$t('global.delete')}}</el-button>
-            <el-button size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)" v-if="isCreate && scope.row.status ==='0'">{{hasRelease?$t('global.release'):$t('planMonitor.applyRelease')}}</el-button>
-            <el-button size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)" v-if="scope.row.status === '1'">{{$t('planMonitor.preview')}}</el-button>
-            <el-button size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)" v-if="scope.row.status === '1'" >{{$t('planMonitor.revoke')}}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-	  <create-empty-plan ref="createEmptyPlan" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" @refresh="refresh"/>
-	  <!-- @dispatchOperate="dispatchOperate" -->
-	  <edit-plan-name ref="editPlan" @renewal="getRunPlanList" />
+    <div class="runPlanHeader" style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;">
+      <div class="runPlanList">{{ $t('planMonitor.openRunPlan.runPlanList') }}</div>
+      <el-button v-if="isCreate" size="small" type="primary" class="createRunPlan" @click="handleCreate">{{ $t('planMonitor.createRunningDiagram') }}</el-button>
+    </div>
+    <el-table
+      :data="runPlanList"
+      height="500"
+      stripe
+      border
+      style="width: 90%;margin-left:5%;margin-top:20px;display: inline-block;"
+    >
+      <el-table-column prop="name" :label="this.$t('planMonitor.runGraphName')" />
+      <el-table-column v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))" :label="this.$t('global.status')">
+        <template slot-scope="scope">
+          <el-tag>{{ handlerStatus(scope.row) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        v-if="!(/^\/design\/userlist/.test(this.$route.fullPath))"
+        prop="explanation"
+        show-overflow-tooltip
+        :label="this.$t('planMonitor.explanation')"
+      />
+      <el-table-column :label="this.$t('planMonitor.creationDate')">
+        <template slot-scope="scope">
+          <el-tag type="success">{{ handleTime(scope.row.createTime) }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column :label="this.$t('global.operate')" width="400">
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.status !=='1'" size="mini" class="button_box" type="success" @click="handleConfirm(scope.row)">{{ $t('planMonitor.load') }}</el-button>
+          <el-button v-if="isCreate && scope.row.status !=='1'" size="mini" class="button_box" type="primary" @click="handleEdit(scope.row)">{{ $t('planMonitor.modifyName') }}</el-button>
+          <el-button v-if="isCreate && scope.row.status !=='1'" size="mini" class="button_box" type="danger" @click="handleDelete(scope.row)">{{ $t('global.delete') }}</el-button>
+          <el-button v-if="isCreate && scope.row.status ==='0'" size="mini" class="button_box" type="primary" @click="handlePublish(scope.row)">{{ hasRelease?$t('global.release'):$t('planMonitor.applyRelease') }}</el-button>
+          <el-button v-if="scope.row.status === '1'" size="mini" class="button_box" type="primary" @click="handlePreview(scope.row)">{{ $t('planMonitor.preview') }}</el-button>
+          <el-button v-if="scope.row.status === '1'" size="mini" class="button_box" type="danger" @click="handelRevert(scope.row)">{{ $t('planMonitor.revoke') }}</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <create-empty-plan ref="createEmptyPlan" :plan-convert="PlanConvert" @dispatchDialog="dispatchDialog" @refresh="refresh" />
+    <!-- @dispatchOperate="dispatchOperate" -->
+    <edit-plan-name ref="editPlan" @renewal="getRunPlanList" />
   </el-card>
 </template>
 <script>
@@ -48,156 +52,154 @@ import { getRpListByMapId, deleteRunPlan } from '@/api/runplan';
 import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/router/index';
 export default {
-	name: 'userRunPlanList',
-	components: {
-		CreateEmptyPlan,
-		EditPlanName
-		// LimitList
-	},
-	filters: {
-	},
-	data() {
-		return {
-			dialogShow: false,
-			loading: false,
-			// height: 260,
-			// planId: '',
-			// planName: '',
-			type: 'add',
-			// defaultShowKeys: [],
-			runPlanList: [],
-			runPlanDict: {},
-			isCreate:false,
-			PlanConvert: {}
-			// defaultProps: {
-			// 	label: 'name'
-			// }
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 60 -30;
-		},
-		skinCode() {
-			return this.$route.query.skinCode || '02';
-		},
+    name: 'UserRunPlanList',
+    components: {
+        CreateEmptyPlan,
+        EditPlanName
+        // LimitList
+    },
+    filters: {
+    },
+    data() {
+        return {
+            dialogShow: false,
+            loading: false,
+            // height: 260,
+            // planId: '',
+            // planName: '',
+            type: 'add',
+            // defaultShowKeys: [],
+            runPlanList: [],
+            runPlanDict: {},
+            isCreate:false,
+            PlanConvert: {}
+            // defaultProps: {
+            // 	label: 'name'
+            // }
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height - 60 - 30;
+        },
+        skinCode() {
+            return this.$route.query.skinCode || '02';
+        },
         hasRelease() {
             return this.$store.state.user.roles.includes('04') ||
                 this.$store.state.user.roles.includes('05');
         }
-	},
-	created(){
-		this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.skinCode);
-	},
-	mounted(){
-		this.getRunPlanList();
-	},
-	watch: {
-		'$route' () {
-			this.getRunPlanList();
-		}
-	},
-	methods:{
-		refresh(){
-			this.getRunPlanList();
-		},
-		getRunPlanList() {
-			if(/^\/design\/userlist/.test(this.$route.fullPath)){
-				this.isCreate=false;
-				getRpListByUserMapId(this.$route.params.mapId).then((resp) => {
-					this.runPlanList = resp.data;
-					this.runPlanList.forEach(elem => {
-						this.runPlanDict[elem.id] = elem.name;
-					});
-					// this.dialogShow = true;
-				}).catch(() => {
-					this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
-				});
-			}
-			else{
-				this.isCreate=true;
-				getRpListByMapId(this.$route.params.mapId).then((resp) => {
-					this.runPlanList = resp.data;
-					this.runPlanList.forEach(elem => {
-						this.runPlanDict[elem.id] = elem.name;
-					});
-					// this.dialogShow = true;
-				}).catch(() => {
-					this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
-				});
-			}
-		},
-		// dispatchOperate(){
-		// 	this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
-		// },
-		dispatchDialog(){
-			this.$refs['createEmptyPlan'].doShow();
-		},
-		handleCreate(){
-			this.$refs['createEmptyPlan'].doShow();
-		},
-		handleConfirm(row){
-			this.loadRunPlanData({
-				planId: row.id,
-				skinCode: this.$route.query.skinCode,
-				planName: row.name
-			});
-		},
-		// 修改运行图名称
-		handleEdit(row) {
-			if (row.id && row.name) {
-				this.$refs.editPlan.doShow({id: row.id, name: row.name});
-			} else {
-				this.$message.info(this.$t('planMonitor.openRunPlan.pleaseSelectRunplan'));
-			}
-		},
-		loadRunPlanData({ refresh, planId, skinCode, planName }) {
-			if (refresh) {
-				this.$store.dispatch('runPlan/refresh');
-			} else {
-				const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
-				if(/^\/design\/userlist/.test(this.$route.fullPath)){
-					this.$router.push({ path: `${UrlConfig.plan.usertool}`, query: query });
-				}
-				else{
-					this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-				}
-			}
-		},
-		// 删除运行图
-		handleDelete(row) {
-			this.$confirm(this.$t('planMonitor.openRunPlan.confirmDeleteRunPlan'), this.$t('tip.hint'), {
-				confirmButtonText: this.$t('tip.confirm'),
-				cancelButtonText: this.$t('tip.cancel'),
-				type: 'warning'
-			}).then(() => {
-				deleteRunPlan(row.id).then(Response => {
-					this.$message.success(this.$t('planMonitor.openRunPlan.deleteSuccess'));
-					// if (row.id === this.$route.query.planId) {
-					// 	const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId };
-					// 	this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-					// }
-					this.refresh();
-					// this.doClose();
-				}).catch(() => {
-					this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
-				});
-			}).catch(() => { });
-		},
-        handlePublish(row) {
-            this.$confirm(this.hasRelease? this.$t('tip.publishRunPlanTips'):this.$t('tip.applyRunPlanTips'),this.$t('tip.hint'),{
+    },
+    watch: {
+        '$route' () {
+            this.getRunPlanList();
+        }
+    },
+    created() {
+        this.PlanConvert = this.$theme.loadPlanConvert(this.$route.query.skinCode);
+    },
+    mounted() {
+        this.getRunPlanList();
+    },
+    methods:{
+        refresh() {
+            this.getRunPlanList();
+        },
+        getRunPlanList() {
+            if (/^\/design\/userlist/.test(this.$route.fullPath)) {
+                this.isCreate = false;
+                getRpListByUserMapId(this.$route.params.mapId).then((resp) => {
+                    this.runPlanList = resp.data;
+                    this.runPlanList.forEach(elem => {
+                        this.runPlanDict[elem.id] = elem.name;
+                    });
+                    // this.dialogShow = true;
+                }).catch(() => {
+                    this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
+                });
+            } else {
+                this.isCreate = true;
+                getRpListByMapId(this.$route.params.mapId).then((resp) => {
+                    this.runPlanList = resp.data;
+                    this.runPlanList.forEach(elem => {
+                        this.runPlanDict[elem.id] = elem.name;
+                    });
+                    // this.dialogShow = true;
+                }).catch(() => {
+                    this.$messageBox(this.$t('planMonitor.openRunPlan.getRunPlanListFail'));
+                });
+            }
+        },
+        // dispatchOperate(){
+        // 	this.$refs[operateObj.dialogName][operateObj.operate](operateObj.params);
+        // },
+        dispatchDialog() {
+            this.$refs['createEmptyPlan'].doShow();
+        },
+        handleCreate() {
+            this.$refs['createEmptyPlan'].doShow();
+        },
+        handleConfirm(row) {
+            this.loadRunPlanData({
+                planId: row.id,
+                skinCode: this.$route.query.skinCode,
+                planName: row.name
+            });
+        },
+        // 修改运行图名称
+        handleEdit(row) {
+            if (row.id && row.name) {
+                this.$refs.editPlan.doShow({id: row.id, name: row.name});
+            } else {
+                this.$message.info(this.$t('planMonitor.openRunPlan.pleaseSelectRunplan'));
+            }
+        },
+        loadRunPlanData({ refresh, planId, skinCode, planName }) {
+            if (refresh) {
+                this.$store.dispatch('runPlan/refresh');
+            } else {
+                const query = { skinCode: skinCode, mapId: this.$route.params.mapId, planId: planId, planName: planName };
+                if (/^\/design\/userlist/.test(this.$route.fullPath)) {
+                    this.$router.push({ path: `${UrlConfig.plan.usertool}`, query: query });
+                } else {
+                    this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+                }
+            }
+        },
+        // 删除运行图
+        handleDelete(row) {
+            this.$confirm(this.$t('planMonitor.openRunPlan.confirmDeleteRunPlan'), this.$t('tip.hint'), {
                 confirmButtonText: this.$t('tip.confirm'),
                 cancelButtonText: this.$t('tip.cancel'),
                 type: 'warning'
             }).then(() => {
-                if (this.hasRelease){
-                    publishRunPlan(row.id,{runPlanName: name}).then(resp => {
+                deleteRunPlan(row.id).then(Response => {
+                    this.$message.success(this.$t('planMonitor.openRunPlan.deleteSuccess'));
+                    // if (row.id === this.$route.query.planId) {
+                    // 	const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId };
+                    // 	this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+                    // }
+                    this.refresh();
+                    // this.doClose();
+                }).catch(() => {
+                    this.$messageBox(this.$t('tip.deleteOperationGraphFailed'));
+                });
+            }).catch(() => { });
+        },
+        handlePublish(row) {
+            this.$confirm(this.hasRelease ? this.$t('tip.publishRunPlanTips') : this.$t('tip.applyRunPlanTips'), this.$t('tip.hint'), {
+                confirmButtonText: this.$t('tip.confirm'),
+                cancelButtonText: this.$t('tip.cancel'),
+                type: 'warning'
+            }).then(() => {
+                if (this.hasRelease) {
+                    publishRunPlan(row.id, {runPlanName: name}).then(resp => {
                         this.$message.success(this.$t('tip.publishRunPlanSuccess'));
                         this.refresh();
                     }).catch(() => {
                         this.$messageBox(this.$t('tip.publishRunPlanFail'));
                         this.refresh();
-                    })
+                    });
                 } else {
                     releaseOrCancelRunPlan(row.id, '1').then(resp => {
                         this.$message.success(this.$t('tip.applyRunPlanSuccess'));
@@ -205,58 +207,58 @@ export default {
                     }).catch(() => {
                         this.$messageBox(this.$t('tip.applyRunPlanFail'));
                         this.refresh();
-                    })
+                    });
                 }
             });
         },
         handelRevert(row) {
-		    this.$confirm(this.$t('tip.cancelRunPlanTips'),this.$t('tip.hint'),{
+		    this.$confirm(this.$t('tip.cancelRunPlanTips'), this.$t('tip.hint'), {
 		        confirmButtonText: this.$t('tip.confirm'),
                 cancelButtonText: this.$t('tip.cancel'),
                 type:'warning'
             }).then(() => {
-                releaseOrCancelRunPlan(row.id,'0').then(resp=> {
+                releaseOrCancelRunPlan(row.id, '0').then(resp=> {
                     this.$message.success(this.$t('tip.cancelRunPlanSuccess'));
                     this.refresh();
                 }).catch(() => {
-                    this.$messageBox(this.$t('tip.cancelRunPlanFail'))
+                    this.$messageBox(this.$t('tip.cancelRunPlanFail'));
                     this.refresh();
-                })
-            })
+                });
+            });
         },
         handlerStatus(row) {
             let lessonStatus = '';
-            switch (row.status){
-                case '0':
-                    lessonStatus = this.$t('lesson.notRelease');
-                    break;
-                case '1':
-                    lessonStatus = this.$t('lesson.pendingReview');
-                    break;
-                case '2':
-                    lessonStatus = this.$t('lesson.published');
-                    break;
-                case '3':
-                    lessonStatus = this.$t('lesson.rejected');
-                    break;
+            switch (row.status) {
+            case '0':
+                lessonStatus = this.$t('lesson.notRelease');
+                break;
+            case '1':
+                lessonStatus = this.$t('lesson.pendingReview');
+                break;
+            case '2':
+                lessonStatus = this.$t('lesson.published');
+                break;
+            case '3':
+                lessonStatus = this.$t('lesson.rejected');
+                break;
             }
             return lessonStatus;
         },
         handleTime(time) {
-			return time.replace("T"," ");
+            return time.replace('T', ' ');
         },
-        handlePreview(row){
+        handlePreview(row) {
             previewRunPlan(row.id).then(resp => {
                 const query = {
-                    skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id,from:''
+                    skinCode: row.skinCode, prdType: '01', group: resp.data, mapId: row.mapId, planId: row.id, from:''
                 };
                 this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
                 launchFullscreen();
             }).catch(error => {
-                this.$messageBox(this.$t('tip.createSimulationFaild')+this.$t('global.colon')+error.message);
+                this.$messageBox(this.$t('tip.createSimulationFaild') + this.$t('global.colon') + error.message);
             });
         }
-	}
+    }
 };
 </script>
 <style scoped>
diff --git a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
index 10d220834..ee1ec1ee4 100644
--- a/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
+++ b/src/views/planMonitor/editTool/menus/createEmptyPlan.vue
@@ -12,7 +12,7 @@
   >
     <div>
       <el-tabs v-model="activeTab" type="card">
-         <el-tab-pane :label="this.$t('planMonitor.normalNew')" name="first">
+        <el-tab-pane :label="this.$t('planMonitor.normalNew')" name="first">
           <el-row>
             <el-form ref="form" :model="newModel" label-width="140px" size="mini" :rules="rules" @submit.native.prevent>
               <el-form-item :label="this.$t('planMonitor.runGraphName')+this.$t('global.colon')" prop="name">
@@ -69,196 +69,196 @@ import { UrlConfig } from '@/router/index';
 import XLSX from 'xlsx';
 
 export default {
-	name: 'CreateEmptyPlan',
-	components: {
-	},
-	props: {
-		planConvert: {
-			type: Object,
-			default: function() {
-				return { };
-			}
-		}
-	},
-	data() {
-		return {
-			activeTab: 'second',
-			dialogShow: false,
-			loading: false,
-			loadingDig: null,
-			publishMapList: [],
-			newModel: {
-				name: '',
-				skinCode: this.$route.query.skinCode
-			},
-			pullModel: {
-				templateId: '',
-				name: '',
-				skinCode: this.$route.query.skinCode
-			}
-		};
-	},
-	computed: {
-		title() {
-			return this.$t('planMonitor.newRunGraph');
-		},
-		rules() {
-			return {
-				name: [
-					{ required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
-				]
-			};
-		},
-		pullRules() {
-			return {
-				templateId: [
-					{ required: true, message: this.$t('rules.chooseToPublishTheRunGraph'), trigger: 'change' }
-				],
-				name: [
-					{ required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
-				]
-			};
-		}
-	},
-	mounted() {
+    name: 'CreateEmptyPlan',
+    components: {
+    },
+    props: {
+        planConvert: {
+            type: Object,
+            default: function() {
+                return { };
+            }
+        }
+    },
+    data() {
+        return {
+            activeTab: 'second',
+            dialogShow: false,
+            loading: false,
+            loadingDig: null,
+            publishMapList: [],
+            newModel: {
+                name: '',
+                skinCode: this.$route.query.skinCode
+            },
+            pullModel: {
+                templateId: '',
+                name: '',
+                skinCode: this.$route.query.skinCode
+            }
+        };
+    },
+    computed: {
+        title() {
+            return this.$t('planMonitor.newRunGraph');
+        },
+        rules() {
+            return {
+                name: [
+                    { required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
+                ]
+            };
+        },
+        pullRules() {
+            return {
+                templateId: [
+                    { required: true, message: this.$t('rules.chooseToPublishTheRunGraph'), trigger: 'change' }
+                ],
+                name: [
+                    { required: true, message: this.$t('rules.enterTheNameOfTheRunGraph'), trigger: 'blur' }
+                ]
+            };
+        }
+    },
+    mounted() {
 
-	},
-	methods: {
-		async initLoad() {
-			const res = await queryRunPlanList(this.$route.query.skinCode);
-			if (res.code == 200 && res.data.length) {
-				this.publishMapList = res.data;
-			}
-		},
-		doShow() {
-			this.dialogShow = true;
-			this.initLoad();
-		},
-		doClose() {
-			this.loading = false;
-			this.dialogShow = false;
-			this.newModel.name = '';
-			this.pullModel.templateId = '';
-			this.pullModel.name = '';
-			if (this.$refs.form) {
-				this.$refs.form.resetFields();
-			}
-			if (this.$refs.pullForm) {
-				this.$refs.pullForm.resetFields();
-			}
-		},
-		handleCommit() {
-			if (this.activeTab === 'first') {
-				this.$refs['form'].validate((valid) => {
-					if (valid) {
-						this.loading = true;
-						createEmptyPlan(this.newModel).then(resp => {
-							const params = {
-								dialogName: 'openRunPlan',
-								operate: 'loadRunPlanData',
-								params: { planId: resp.data, skinCode: this.$route.query.skinCode, planName: this.newModel.name, refresh: true }
-							};
-							this.$emit('refresh');
-							// this.$emit('dispatchOperate', params);
-							this.$message.success(this.$t('tip.createAnEmptyRunGraphSuccessfully'));
-							// this.jump(resp.data, this.newModel.name);
-							this.doClose();
-						}).catch((error) => {
-							this.$messageBox(this.$t('error.createOperationGraphFailed')+ this.$t('global.colon') + error.message);
-							this.doClose();
-						});
-					}
-				});
-			} else {
-				this.$refs['pullForm'].validate((valid) => {
-					if (valid) {
-						this.loading = true;
-						postCreatePlan(this.pullModel).then(resp => {
-							this.$message.success(this.$t('tip.createARunGraphSuccessfully'));
-							// this.jump(resp.data, this.pullModel.name);
-							this.$emit('refresh');
-							this.doClose();
-						}).catch((error) => {
-							this.$messageBox(this.$t('error.createOperationGraphFailed')+ this.$t('global.colon') + error.message);
-							this.doClose();
-						});
-					}
-				});
-			}
-		},
-		importf(item) {
-			const obj = this.$refs.files;
-			if (obj.files) {
-				const file = obj.files[0];
-				this.handleImportRunPlan(file);
-				obj.value = '';
-			}
-		},
-		loadingScreen() {
-			this.loadingDig = this.$loading({
-				lock: true,
-				text: this.$t('tip.underImport'),
-				spinner: 'el-icon-loading',
-				background: 'rgba(0, 0, 0, 0.7)'
-			});
-		},
-		// 导入运行图
-		handleImportRunPlan(file) {
-			if (file) {
-				this.loadingScreen();
-				setTimeout(() => {
-					const that = this;
-					const reader = new FileReader();
-					if (reader) {
-						reader.onload = function (e) {
-							let wb;
-							const data = e.target.result;
-							if (that.rABS) {
-								wb = XLSX.read(btoa(that.fixdata(data)), { // 手动转化
-									type: 'base64'
-								});
-							} else {
-								wb = XLSX.read(data, {
-									type: 'binary'
-								});
-							}
-							if (wb) {
-								try {
-									let jsonData = [];
-									for (const index in wb.Sheets) {
-										jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
-									}
+    },
+    methods: {
+        async initLoad() {
+            const res = await queryRunPlanList(this.$route.params.mapId);
+            if (res.code == 200 && res.data.length) {
+                this.publishMapList = res.data;
+            }
+        },
+        doShow() {
+            this.dialogShow = true;
+            this.initLoad();
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.newModel.name = '';
+            this.pullModel.templateId = '';
+            this.pullModel.name = '';
+            if (this.$refs.form) {
+                this.$refs.form.resetFields();
+            }
+            if (this.$refs.pullForm) {
+                this.$refs.pullForm.resetFields();
+            }
+        },
+        handleCommit() {
+            if (this.activeTab === 'first') {
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.loading = true;
+                        createEmptyPlan(this.newModel).then(resp => {
+                            const params = {
+                                dialogName: 'openRunPlan',
+                                operate: 'loadRunPlanData',
+                                params: { planId: resp.data, skinCode: this.$route.query.skinCode, planName: this.newModel.name, refresh: true }
+                            };
+                            this.$emit('refresh');
+                            // this.$emit('dispatchOperate', params);
+                            this.$message.success(this.$t('tip.createAnEmptyRunGraphSuccessfully'));
+                            // this.jump(resp.data, this.newModel.name);
+                            this.doClose();
+                        }).catch((error) => {
+                            this.$messageBox(this.$t('error.createOperationGraphFailed') + this.$t('global.colon') + error.message);
+                            this.doClose();
+                        });
+                    }
+                });
+            } else {
+                this.$refs['pullForm'].validate((valid) => {
+                    if (valid) {
+                        this.loading = true;
+                        postCreatePlan(this.pullModel).then(resp => {
+                            this.$message.success(this.$t('tip.createARunGraphSuccessfully'));
+                            // this.jump(resp.data, this.pullModel.name);
+                            this.$emit('refresh');
+                            this.doClose();
+                        }).catch((error) => {
+                            this.$messageBox(this.$t('error.createOperationGraphFailed') + this.$t('global.colon') + error.message);
+                            this.doClose();
+                        });
+                    }
+                });
+            }
+        },
+        importf(item) {
+            const obj = this.$refs.files;
+            if (obj.files) {
+                const file = obj.files[0];
+                this.handleImportRunPlan(file);
+                obj.value = '';
+            }
+        },
+        loadingScreen() {
+            this.loadingDig = this.$loading({
+                lock: true,
+                text: this.$t('tip.underImport'),
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+        },
+        // 导入运行图
+        handleImportRunPlan(file) {
+            if (file) {
+                this.loadingScreen();
+                setTimeout(() => {
+                    const that = this;
+                    const reader = new FileReader();
+                    if (reader) {
+                        reader.onload = function (e) {
+                            let wb;
+                            const data = e.target.result;
+                            if (that.rABS) {
+                                wb = XLSX.read(btoa(that.fixdata(data)), { // 手动转化
+                                    type: 'base64'
+                                });
+                            } else {
+                                wb = XLSX.read(data, {
+                                    type: 'binary'
+                                });
+                            }
+                            if (wb) {
+                                try {
+                                    let jsonData = [];
+                                    for (const index in wb.Sheets) {
+                                        jsonData = that.planConvert.importData(wb.Sheets[index], jsonData);
+                                    }
 
-									importRunPlan({ mapId: that.$route.params.mapId || '02', runPlanList: jsonData }).then(response => {
-										that.loadingDig.close();
-										that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
-										// this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
-									}).catch(error => {
-										that.loadingDig.close();
-										that.$message.warning(`${that.$t('tip.importRunGraphFailed')} ${error.message}`);
-									});
+                                    importRunPlan({ mapId: that.$route.params.mapId || '02', runPlanList: jsonData }).then(response => {
+                                        that.loadingDig.close();
+                                        that.$message.success(that.$t('tip.importOperationGraphSuccessfully'));
+                                        // this.$emit('dispatchDialog', { name: 'openRunPlan', params: {type: 'add'} });
+                                    }).catch(error => {
+                                        that.loadingDig.close();
+                                        that.$message.warning(`${that.$t('tip.importRunGraphFailed')} ${error.message}`);
+                                    });
 
-								} catch (error) {
-									that.loadingDig.close();
-									that.$message.warning(`${that.$t('tip.parseRunGraphFailed')} ${error.message}`);
-								}
-							}
-						};
-						if (that.rABS) {
-							reader.readAsArrayBuffer(file);
-						} else {
-							reader.readAsBinaryString(file);
-						}
-					}
-				}, 200);
-			}
-			this.doClose();
-		},
-		jump(planId, planName) {
-			const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId, planId: planId, planName: planName };
-			this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
-		}
-	}
+                                } catch (error) {
+                                    that.loadingDig.close();
+                                    that.$message.warning(`${that.$t('tip.parseRunGraphFailed')} ${error.message}`);
+                                }
+                            }
+                        };
+                        if (that.rABS) {
+                            reader.readAsArrayBuffer(file);
+                        } else {
+                            reader.readAsBinaryString(file);
+                        }
+                    }
+                }, 200);
+            }
+            this.doClose();
+        },
+        jump(planId, planName) {
+            const query = { skinCode: this.$route.query.skinCode, mapId: this.$route.query.mapId, planId: planId, planName: planName };
+            this.$router.push({ path: `${UrlConfig.plan.tool}`, query: query });
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/home.vue b/src/views/planMonitor/home.vue
index 32dc21b90..b7c4d894a 100644
--- a/src/views/planMonitor/home.vue
+++ b/src/views/planMonitor/home.vue
@@ -28,22 +28,22 @@ import home2 from '@/assets/home/plan2.png';
 import home3 from '@/assets/home/plan3.png';
 
 export default {
-	name: 'Home',
-	data() {
-		return {
-			listImg: [
-				{ src: home1 },
-				{ src: home2 },
-				{ src: home3 }
-			],
-			logo: logo
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height;
-		}
-	}
+    name: 'Home',
+    data() {
+        return {
+            listImg: [
+                { src: home1 },
+                { src: home2 },
+                { src: home3 }
+            ],
+            logo: logo
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height;
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/planMonitor/index.vue b/src/views/planMonitor/index.vue
index 8e493c49b..79c18c59f 100644
--- a/src/views/planMonitor/index.vue
+++ b/src/views/planMonitor/index.vue
@@ -19,38 +19,38 @@ import drapLeft from '@/views/components/drapLeft/index';
 import localStore from 'storejs';
 
 export default {
-	name: 'Exam',
-	components: {
-		planList,
-		drapLeft
-	},
-	data() {
-		return {
-			listShow: true,
-			widthLeft: Number(localStore.get('LeftWidth')) || 450
-		};
-	},
-	computed: {
-		...mapGetters([
-			'lessonbar'
-		]),
-		height() {
-			return this.$store.state.app.height;
-		}
-	},
-	watch: {
-		'lessonbar.opened': function (val) {
-			this.listShow = val;
-		}
-	},
-	methods: {
-		refresh() {
-			this.$refs && this.$refs.planList && this.$refs.planList.refresh();
-		},
-		drapWidth(width) {
-			this.widthLeft = Number(width);
-		}
-	}
+    name: 'Exam',
+    components: {
+        planList,
+        drapLeft
+    },
+    data() {
+        return {
+            listShow: true,
+            widthLeft: Number(localStore.get('LeftWidth')) || 450
+        };
+    },
+    computed: {
+        ...mapGetters([
+            'lessonbar'
+        ]),
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    watch: {
+        'lessonbar.opened': function (val) {
+            this.listShow = val;
+        }
+    },
+    methods: {
+        refresh() {
+            this.$refs && this.$refs.planList && this.$refs.planList.refresh();
+        },
+        drapWidth(width) {
+            this.widthLeft = Number(width);
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>

From 7d1d7758e48a16620a40ff415e66dc0a6c3c98f2 Mon Sep 17 00:00:00 2001
From: ival <610568032@qq.com>
Date: Wed, 30 Oct 2019 17:26:16 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8C=97=E4=BA=AC=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/systemTime/index.vue | 75 ++++++++++++-----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/src/views/components/systemTime/index.vue b/src/views/components/systemTime/index.vue
index 84f8e61bb..4894e0e1f 100644
--- a/src/views/components/systemTime/index.vue
+++ b/src/views/components/systemTime/index.vue
@@ -19,43 +19,43 @@ import Digit from './digit';
 import Separator from './separator';
 
 export default {
-	name: 'SystenTime',
-	components: {
-		Digit,
-		Separator
-	},
-	props: {
-		background: {
-			type: String,
-			default() {
-				return '#000';
-			}
-		},
-		color: {
-			type: String,
-			default() {
-				return '#00FF00';
-			}
-		},
-		time: {
-			type: String,
-			default() {
-				return '12:3456';
-			}
-		},
-		zoom: {
-			type: Number,
-			default() {
-				return 4;
-			}
-		},
-		fine: {
-			type: Number,
-			default() {
-				return 2;
-			}
-		}
-	}
+    name: 'SystenTime',
+    components: {
+        Digit,
+        Separator
+    },
+    props: {
+        background: {
+            type: String,
+            default() {
+                return '#000';
+            }
+        },
+        color: {
+            type: String,
+            default() {
+                return '#00FF00';
+            }
+        },
+        time: {
+            type: String,
+            default() {
+                return '12:3456';
+            }
+        },
+        zoom: {
+            type: Number,
+            default() {
+                return 4;
+            }
+        },
+        fine: {
+            type: Number,
+            default() {
+                return 2;
+            }
+        }
+    }
 };
 </script>
 
@@ -63,5 +63,6 @@ export default {
     .system-time-box {
         display: inline-block;
         text-align: center;
+		background: #000;
     }
 </style>

From e5c832aa00401a14a4f30f700f4f37879ad4926c Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 17:41:29 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/mapPrd/{skinStyle}/list=20=20=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=20=20/api/mapPrd/{mapId}/list?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/management/mapprd.js                  |   4 +-
 .../lessoncategory/edit/lesson/index.vue      |   2 +-
 src/views/lesson/trainingmanage/draft.vue     |   8 +-
 src/views/lesson/trainingmanage/index.vue     |   2 +-
 src/views/management/userSimulation/add.vue   | 334 +++++------
 src/views/package/draft/editRule.vue          | 563 +++++++++---------
 src/views/package/draft/ruleForm.vue          | 337 ++++++-----
 src/views/systemGenerate/create.vue           | 266 ++++-----
 8 files changed, 749 insertions(+), 767 deletions(-)

diff --git a/src/api/management/mapprd.js b/src/api/management/mapprd.js
index 427d858ae..f47c6c664 100644
--- a/src/api/management/mapprd.js
+++ b/src/api/management/mapprd.js
@@ -62,9 +62,9 @@ export function deleteTrainingCategory(data) {
 /**
  * 获取地图下的产品列表
  */
-export function getCommodityMapProduct(skinCode) {
+export function getCommodityMapProduct(mapId) {
     return request({
-        url: `/api/mapPrd/${skinCode}/list`,
+        url: `/api/mapPrd/${mapId}/list`,
         method: 'get'
     });
 }
diff --git a/src/views/lesson/lessoncategory/edit/lesson/index.vue b/src/views/lesson/lessoncategory/edit/lesson/index.vue
index 66fa12c63..d7edfe84f 100644
--- a/src/views/lesson/lessoncategory/edit/lesson/index.vue
+++ b/src/views/lesson/lessoncategory/edit/lesson/index.vue
@@ -119,7 +119,7 @@ export default {
             } else {
                 this.courseModel.skinCode = this.$route.query.skinCode;
             }
-            getCommodityMapProduct(this.$route.query.skinCode).then(response => {
+            getCommodityMapProduct(this.$route.query.mapId).then(response => {
                 this.productList = response.data || [];
                 this.productList = this.productList.filter(elem => { return elem.prdType != '03'; });
             });
diff --git a/src/views/lesson/trainingmanage/draft.vue b/src/views/lesson/trainingmanage/draft.vue
index f7c69ca6b..11ca93316 100644
--- a/src/views/lesson/trainingmanage/draft.vue
+++ b/src/views/lesson/trainingmanage/draft.vue
@@ -197,7 +197,7 @@ export default {
         }
     },
     mounted() {
-        this.skinCodeChoose(this.$route.params.skinCode);
+        this.mapIdChoose(this.$route.query.mapId);
     },
     methods: {
         show(data) {
@@ -211,11 +211,11 @@ export default {
             this.dialogShow = false;
             this.loading = false;
         },
-        skinCodeChoose(skinCode) {
+        mapIdChoose(mapId) {
             this.operateModel.prdCode = '';
             this.productList = [];
-            if (skinCode) {
-                getCommodityMapProduct(skinCode).then((response) => {
+            if (mapId) {
+                getCommodityMapProduct(mapId).then((response) => {
                     this.productList = response.data;
                     this.productList = this.productList.filter(elem => { return elem.prdType != '03'; });
                 });
diff --git a/src/views/lesson/trainingmanage/index.vue b/src/views/lesson/trainingmanage/index.vue
index fa7c82c12..30e01bb9b 100644
--- a/src/views/lesson/trainingmanage/index.vue
+++ b/src/views/lesson/trainingmanage/index.vue
@@ -172,7 +172,7 @@ export default {
             getSkinCodeList().then(response => {
                 this.skinCodeList = response.data;
             });
-            getCommodityMapProduct(this.$route.params.skinCode).then((response) => {
+            getCommodityMapProduct(this.$route.query.mapId).then((response) => {
                 const productList = response.data;
                 if (productList && productList.length > 0) {
                     productList.forEach(elem => {
diff --git a/src/views/management/userSimulation/add.vue b/src/views/management/userSimulation/add.vue
index 4a6ab2348..3728527b5 100644
--- a/src/views/management/userSimulation/add.vue
+++ b/src/views/management/userSimulation/add.vue
@@ -15,176 +15,168 @@ import { getPublishMapList } from '@/api/jmap/map';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
 
 export default {
-	name: 'UsersTrainingAdd',
-	props: {
-		type: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			dialogVisible: false,
-			formModel: {
-				mapId: '',
-				mapPrdCode: '',
-				userId: '',
-				userName: '',
-				duration: ''
-			},
-			LessonList: [],
-			mapPrdList: [],
-			UserList: [],
-			UserLoading: false
-		};
-	},
-	computed: {
-		form() {
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') },
-					{ prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') },
-					{ prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') },
-					{ prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const crules = {
-				mapId: [
-					{ required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
-				],
-				userName: [
-					{ required: true, message: this.$t('rules.chooseUser'), trigger: 'change' }
-				],
-				mapPrdCode: [
-					{ required: true, message: this.$t('rules.productInput'), trigger: 'change' }
-				],
-				duration: [
-					{ required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
-				]
-			};
-			return crules;
-		},
-		title() {
-			return this.$t('system.createSimulationTitle');
-		}
-	},
-	mounted() {
-		this.initLoadPage();
-	},
-	methods: {
-		initLoadPage() {
-			// 加载发布课程列表
-			this.LessonList.length = 0;
-			this.UserList.length = 0;
-			const param = {
-				pageNum: 1,
-				pageSize: 10
-			};
-			getPublishMapList(param).then(response => {
-				const data = response.data.list;
-				if (data && data.length) {
-					data.forEach(elem => {
-						this.LessonList.push({ value: elem.id, label: elem.name, skinCode: elem.skinCode });
-					});
-				}
-			});
-		},
-		// 搜索查询input
-		async querySearchAsync(queryString, cb) {
-			// 根据queryString 查询用户 并显示
-			const results = [];
-			if (queryString) {
-				try {
-					const params = {
-						fuzzyParam: queryString
-					};
-					const res = await getDimUserList(params);
-					const list = res.data;
-					list.forEach(item => {
-						const value = {
-							id: item.id,
-							value: `${item.nickname}(${item.name})${item.mobile}`
-						};
-						results.push(value);
-					});
-					cb(results);
-				} catch (error) {
-					console.error(error);
-					cb(results);
-				}
-			} else {
-				cb(results);
-			}
-		},
-		prdSelect(item) {
-			this.formModel.userId = item.id;
-		},
-		async mapChange(val) {
-			let skinCode = '';
-			this.mapPrdList = [];
-			this.formModel.mapPrdCode = '';
-			if (this.LessonList.length) {
-				this.LessonList.forEach(item => {
-					if (item.value == val) {
-						skinCode = item.skinCode;
-					}
-				});
-				try {
-					const res = await getCommodityMapProduct(skinCode);
-					const data = res.data;
-					if (data && data.length) {
-						data.forEach(elem => {
-							this.mapPrdList.push({ value: elem.code, label: elem.name });
-						});
-					}
-				} catch (error) {
-					console.error(error);
-				}
-			}
-		},
-		show(data) {
-			this.dialogVisible = true;
-		},
-		doSave() {
-			const self = this;
-			this.$refs.dataform.validateForm(() => {
-				self.save();
-			});
-		},
-		save() {
-			const self = this;
-			const params = {
-				mapId: this.formModel.mapId,
-				mapPrdCode: this.formModel.mapPrdCode,
-				userId: this.formModel.userId,
-				duration: parseInt(this.formModel.duration)
-			};
-			if (params.userId) {
-				postSimulationStats(params).then(response => {
-					self.$message.success(this.$t('system.addSuccess'));
-					self.handleClose();
-					self.$emit('reloadTable');
-				}).catch(error => {
-					self.$message.error(this.$t('error.addFailed') + error.message);
-				});
-			} else {
-				this.$message.error(this.$t('rules.chooseUser'));
-			}
-		},
-		handleClose(done) {
-			this.formModel = {
-				mapId: '',
-				mapPrdCode: '',
-				userId: '',
-				userName: '',
-				duration: ''
-			};
-			this.dialogVisible = false;
-		}
-	}
+    name: 'UsersTrainingAdd',
+    props: {
+        type: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            formModel: {
+                mapId: '',
+                mapPrdCode: '',
+                userId: '',
+                userName: '',
+                duration: ''
+            },
+            LessonList: [],
+            mapPrdList: [],
+            UserList: [],
+            UserLoading: false
+        };
+    },
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'mapId', label: this.$t('system.mapName'), type: 'select', required: true, options: this.LessonList, change: true, onChange: this.mapChange, placeholder: this.$t('rules.mapInput') },
+                    { prop: 'mapPrdCode', label: this.$t('system.productName'), type: 'select', required: true, options: this.mapPrdList, placeholder: this.$t('rules.productInput') },
+                    { prop: 'userName', label: this.$t('system.userName'), type: 'complete', required: false, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: this.$t('system.pleaseInputNames') },
+                    { prop: 'duration', label: this.$t('system.trainingUseTime'), type: 'text', rightWidth: true, required: true, message: 's' }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const crules = {
+                mapId: [
+                    { required: true, message: this.$t('rules.mapInput'), trigger: 'change' }
+                ],
+                userName: [
+                    { required: true, message: this.$t('rules.chooseUser'), trigger: 'change' }
+                ],
+                mapPrdCode: [
+                    { required: true, message: this.$t('rules.productInput'), trigger: 'change' }
+                ],
+                duration: [
+                    { required: true, message: this.$t('rules.timeInput'), trigger: 'blur' }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            return this.$t('system.createSimulationTitle');
+        }
+    },
+    mounted() {
+        this.initLoadPage();
+    },
+    methods: {
+        initLoadPage() {
+            // 加载发布课程列表
+            this.LessonList.length = 0;
+            this.UserList.length = 0;
+            const param = {
+                pageNum: 1,
+                pageSize: 10
+            };
+            getPublishMapList(param).then(response => {
+                const data = response.data.list;
+                if (data && data.length) {
+                    data.forEach(elem => {
+                        this.LessonList.push({ value: elem.id, label: elem.name, skinCode: elem.skinCode });
+                    });
+                }
+            });
+        },
+        // 搜索查询input
+        async querySearchAsync(queryString, cb) {
+            // 根据queryString 查询用户 并显示
+            const results = [];
+            if (queryString) {
+                try {
+                    const params = {
+                        fuzzyParam: queryString
+                    };
+                    const res = await getDimUserList(params);
+                    const list = res.data;
+                    list.forEach(item => {
+                        const value = {
+                            id: item.id,
+                            value: `${item.nickname}(${item.name})${item.mobile}`
+                        };
+                        results.push(value);
+                    });
+                    cb(results);
+                } catch (error) {
+                    console.error(error);
+                    cb(results);
+                }
+            } else {
+                cb(results);
+            }
+        },
+        prdSelect(item) {
+            this.formModel.userId = item.id;
+        },
+        async mapChange(val) {
+            this.mapPrdList = [];
+            this.formModel.mapPrdCode = '';
+            try {
+                const res = await getCommodityMapProduct(val);
+                const data = res.data;
+                if (data && data.length) {
+                    data.forEach(elem => {
+                        this.mapPrdList.push({ value: elem.code, label: elem.name });
+                    });
+                }
+            } catch (error) {
+                console.error(error);
+            }
+        },
+        show(data) {
+            this.dialogVisible = true;
+        },
+        doSave() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                self.save();
+            });
+        },
+        save() {
+            const self = this;
+            const params = {
+                mapId: this.formModel.mapId,
+                mapPrdCode: this.formModel.mapPrdCode,
+                userId: this.formModel.userId,
+                duration: parseInt(this.formModel.duration)
+            };
+            if (params.userId) {
+                postSimulationStats(params).then(response => {
+                    self.$message.success(this.$t('system.addSuccess'));
+                    self.handleClose();
+                    self.$emit('reloadTable');
+                }).catch(error => {
+                    self.$message.error(this.$t('error.addFailed') + error.message);
+                });
+            } else {
+                this.$message.error(this.$t('rules.chooseUser'));
+            }
+        },
+        handleClose(done) {
+            this.formModel = {
+                mapId: '',
+                mapPrdCode: '',
+                userId: '',
+                userName: '',
+                duration: ''
+            };
+            this.dialogVisible = false;
+        }
+    }
 };
 </script>
diff --git a/src/views/package/draft/editRule.vue b/src/views/package/draft/editRule.vue
index 8db0fc8f2..6742d8a69 100644
--- a/src/views/package/draft/editRule.vue
+++ b/src/views/package/draft/editRule.vue
@@ -10,7 +10,6 @@
 </template>
 
 <script>
-import { getPublishMapInfo } from '@/api/jmap/map';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
 import { OperatorModel, PermissionType } from '@/scripts/ConstDic';
 import { getTotalRemains } from '@/api/management/author';
@@ -18,295 +17,293 @@ import { superAdmin, admin } from '@/router';
 import { getDimUserList } from '@/api/management/user';
 
 export default {
-	name: 'EditRule',
-	props: {
-		permissionTypeList: {
-			type: Array,
-			required: true
-		},
-		publishMapList: {
-			type: Array,
-			required: true
-		},
-		publisLessonList: {
-			type: Array,
-			required: true
-		}
-	},
-	data() {
-		return {
-			show: false,
-			type: '',
-			mapProductList: [],
-			filterPublisLessonList: [],
-			formModel: {
-				permissionType: '',
-				mapId: '',
-				lessonId: '',
-				prdCode: '',
-				date: '',
-				amount: 0,
-				ownerId: '',
-				roleName: ''
-			},
-			DatePicker: {
-				shortcuts: [{
-					text: this.$t('global.today'),
-					onClick(picker) {
-						picker.$emit('pick', new Date());
-					}
-				}]
-			},
-			numberMessage: ''
-		};
-	},
+    name: 'EditRule',
+    props: {
+        permissionTypeList: {
+            type: Array,
+            required: true
+        },
+        publishMapList: {
+            type: Array,
+            required: true
+        },
+        publisLessonList: {
+            type: Array,
+            required: true
+        }
+    },
+    data() {
+        return {
+            show: false,
+            type: '',
+            mapProductList: [],
+            filterPublisLessonList: [],
+            formModel: {
+                permissionType: '',
+                mapId: '',
+                lessonId: '',
+                prdCode: '',
+                date: '',
+                amount: 0,
+                ownerId: '',
+                roleName: ''
+            },
+            DatePicker: {
+                shortcuts: [{
+                    text: this.$t('global.today'),
+                    onClick(picker) {
+                        picker.$emit('pick', new Date());
+                    }
+                }]
+            },
+            numberMessage: ''
+        };
+    },
 
-	computed: {
-		form() {
-			const form = {
-				labelWidth: '120px',
-				items: [
-					{ prop: 'permissionType', label: this.$t('permission.permissionType'), type: 'select', required: false, disabled: !this.isAdd, options: this.permissionTypeList, change: true, onChange: this.permissionTypeChange },
-					{ prop: 'mapId', label: this.$t('permission.mapName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowMap, options: this.publishMapList, change: true, onChange: this.mapChange },
-					{ prop: 'prdCode', label: this.$t('permission.mapProductName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowMapProduct, options: this.mapProductList, change: true, onChange: this.mapProductChange },
-					{ prop: 'lessonId', label: this.$t('permission.lessonName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowLesson, options: this.filterPublisLessonList },
-					{ prop: 'roleName', label: this.$t('permission.belonger'), type: 'complete', required: false, disabled: !this.isAdd && this.isAdministrator, show: this.isShowRole, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' },
-					{ prop: 'date', label: this.$t('permission.selectDate'), type: 'daterange', required: false, viewFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss' },
-					{ prop: 'amount', label: '权限个数', type: 'number', required: false, min: 0, max: this.maxTotal, message: this.numberMessage }
-				]
-			};
-			return form;
-		},
-		rules() {
-			const that = this;
-			const crules = {
-				permissionType: [
-					{ required: true, message: this.$t('rules.permissionTypeInput'), trigger: 'change' }
-				],
-				mapId: [
-					{ required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
-				],
-				prdCode: [
-					{ required: true, message: this.$t('rules.selectMapProductName'), trigger: 'change' }
-				],
-				lessonId: [
-					{ required: true, message: this.$t('rules.lessonInput'), trigger: 'change' }
-				],
-				date: [
-					{ required: true, message: this.$t('rules.inputTime'), trigger: 'blur' }
-				],
-				amount: [
-					{ required: true, message: this.$t('rules.inputPermissionNumber'), trigger: 'change' },
-					{
-						validator(rule, value, callback) {
-							if (Number.isInteger(Number(value)) && Number(value) > 0) {
-								callback();
-							} else {
-								callback(new Error(that.$t('rules.permissionNumberGreater0')));
-							}
-						},
-						trigger: 'blur'
-					}
-				]
-			};
-			return crules;
-		},
-		title() {
-			if (this.isAdd) {
-				return this.$t('permission.addPermissionPackageRule');
-			} else {
-				return this.$t('permission.editPermissionPackageRule');
-			}
-		},
-		disabled() {
-			return this.formModel.amount > this.maxTotal || this.formModel.amount <= 0;
-		},
-		isAdd() {
-			return this.type == 'add';
-		},
-		isAdministrator() {
-			return this.$store.state.user.roles.indexOf(superAdmin) || this.$store.state.user.roles.indexOf(admin);
-		},
-		isShowMap() {
-			return this.formModel.permissionType !== '04';
+    computed: {
+        form() {
+            const form = {
+                labelWidth: '120px',
+                items: [
+                    { prop: 'permissionType', label: this.$t('permission.permissionType'), type: 'select', required: false, disabled: !this.isAdd, options: this.permissionTypeList, change: true, onChange: this.permissionTypeChange },
+                    { prop: 'mapId', label: this.$t('permission.mapName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowMap, options: this.publishMapList, change: true, onChange: this.mapChange },
+                    { prop: 'prdCode', label: this.$t('permission.mapProductName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowMapProduct, options: this.mapProductList, change: true, onChange: this.mapProductChange },
+                    { prop: 'lessonId', label: this.$t('permission.lessonName'), type: 'select', required: false, disabled: !this.isAdd, show: this.isShowLesson, options: this.filterPublisLessonList },
+                    { prop: 'roleName', label: this.$t('permission.belonger'), type: 'complete', required: false, disabled: !this.isAdd && this.isAdministrator, show: this.isShowRole, querySearchAsync: this.querySearchAsync, handleSelect: this.prdSelect, placeholder: '请输入昵称/名字/手机号' },
+                    { prop: 'date', label: this.$t('permission.selectDate'), type: 'daterange', required: false, viewFormat: 'yyyy-MM-dd HH:mm:ss', valueFormat: 'yyyy-MM-dd HH:mm:ss' },
+                    { prop: 'amount', label: '权限个数', type: 'number', required: false, min: 0, max: this.maxTotal, message: this.numberMessage }
+                ]
+            };
+            return form;
+        },
+        rules() {
+            const that = this;
+            const crules = {
+                permissionType: [
+                    { required: true, message: this.$t('rules.permissionTypeInput'), trigger: 'change' }
+                ],
+                mapId: [
+                    { required: true, message: this.$t('rules.selectMapName'), trigger: 'change' }
+                ],
+                prdCode: [
+                    { required: true, message: this.$t('rules.selectMapProductName'), trigger: 'change' }
+                ],
+                lessonId: [
+                    { required: true, message: this.$t('rules.lessonInput'), trigger: 'change' }
+                ],
+                date: [
+                    { required: true, message: this.$t('rules.inputTime'), trigger: 'blur' }
+                ],
+                amount: [
+                    { required: true, message: this.$t('rules.inputPermissionNumber'), trigger: 'change' },
+                    {
+                        validator(rule, value, callback) {
+                            if (Number.isInteger(Number(value)) && Number(value) > 0) {
+                                callback();
+                            } else {
+                                callback(new Error(that.$t('rules.permissionNumberGreater0')));
+                            }
+                        },
+                        trigger: 'blur'
+                    }
+                ]
+            };
+            return crules;
+        },
+        title() {
+            if (this.isAdd) {
+                return this.$t('permission.addPermissionPackageRule');
+            } else {
+                return this.$t('permission.editPermissionPackageRule');
+            }
+        },
+        disabled() {
+            return this.formModel.amount > this.maxTotal || this.formModel.amount <= 0;
+        },
+        isAdd() {
+            return this.type == 'add';
+        },
+        isAdministrator() {
+            return this.$store.state.user.roles.indexOf(superAdmin) || this.$store.state.user.roles.indexOf(admin);
+        },
+        isShowMap() {
+            return this.formModel.permissionType !== '04';
 
-		},
-		isShowRole() {
-			return this.$store.state.user.roles.indexOf(superAdmin) != -1;
-		},
-		isShowMapProduct() {
-			return this.formModel.permissionType !== '04';
-		},
-		isShowLesson() {
-			return this.formModel.permissionType != '04' && this.formModel.permissionType != '03';
-		}
-	},
-	watch: {
-		formModel: {
-			handler: function (val, old) {
-				this.setTotalMax();
-			},
-			deep: true
-		}
-	},
-	methods: {
-		setTotalMax() {
-			let endTime;
-			let startTime;
-			if (this.formModel.date) {
-				endTime = this.formModel.date[1];
-				startTime = this.formModel.date[0];
-			}
+        },
+        isShowRole() {
+            return this.$store.state.user.roles.indexOf(superAdmin) != -1;
+        },
+        isShowMapProduct() {
+            return this.formModel.permissionType !== '04';
+        },
+        isShowLesson() {
+            return this.formModel.permissionType != '04' && this.formModel.permissionType != '03';
+        }
+    },
+    watch: {
+        formModel: {
+            handler: function (val, old) {
+                this.setTotalMax();
+            },
+            deep: true
+        }
+    },
+    methods: {
+        setTotalMax() {
+            let endTime;
+            let startTime;
+            if (this.formModel.date) {
+                endTime = this.formModel.date[1];
+                startTime = this.formModel.date[0];
+            }
 
-			var validator = {};
-			validator[PermissionType.LESSON] = () => { return this.formModel.lessonId && this.formModel.mapId && this.formModel.prdCode; };
-			validator[PermissionType.EXAM] = () => { return this.formModel.lessonId && this.formModel.mapId && this.formModel.prdCode; };
-			validator[PermissionType.SIMULATION] = () => { return this.formModel.mapId && this.formModel.prdCode; };
-			validator[PermissionType.SCREEN] = () => { return true; };
+            var validator = {};
+            validator[PermissionType.LESSON] = () => { return this.formModel.lessonId && this.formModel.mapId && this.formModel.prdCode; };
+            validator[PermissionType.EXAM] = () => { return this.formModel.lessonId && this.formModel.mapId && this.formModel.prdCode; };
+            validator[PermissionType.SIMULATION] = () => { return this.formModel.mapId && this.formModel.prdCode; };
+            validator[PermissionType.SCREEN] = () => { return true; };
 
-			if (endTime && startTime && this.formModel.permissionType && validator[this.formModel.permissionType]()) {
-				if (endTime > startTime) {
-					const model = {
-						startTime: startTime,
-						endTime: endTime,
-						permissionType: this.formModel.permissionType,
-						ownerId: this.formModel.ownerId
-					};
+            if (endTime && startTime && this.formModel.permissionType && validator[this.formModel.permissionType]()) {
+                if (endTime > startTime) {
+                    const model = {
+                        startTime: startTime,
+                        endTime: endTime,
+                        permissionType: this.formModel.permissionType,
+                        ownerId: this.formModel.ownerId
+                    };
 
-					if (this.formModel.permissionType == PermissionType.LESSON || this.formModel.permissionType == PermissionType.EXAM) {
-						model['lessonId'] = this.formModel.lessonId;
-						model['mapId'] = this.formModel.mapId;
-						model['prdCode'] = this.formModel.prdCode;
-					} else if (this.formModel.permissionType == PermissionType.SIMULATION) {
-						model['mapId'] = this.formModel.mapId;
-						model['prdCode'] = this.formModel.prdCode;
-					}
+                    if (this.formModel.permissionType == PermissionType.LESSON || this.formModel.permissionType == PermissionType.EXAM) {
+                        model['lessonId'] = this.formModel.lessonId;
+                        model['mapId'] = this.formModel.mapId;
+                        model['prdCode'] = this.formModel.prdCode;
+                    } else if (this.formModel.permissionType == PermissionType.SIMULATION) {
+                        model['mapId'] = this.formModel.mapId;
+                        model['prdCode'] = this.formModel.prdCode;
+                    }
 
-					getTotalRemains(model).then(response => {
-						this.maxTotal = response.data;
-						if (this.maxTotal == 0) {
-							this.numberMessage = '可用权限数量为0';
-						} else {
-							this.numberMessage = `（${this.$t('global.remainPermissionNumber')}：${this.maxTotal}）`;
-						}
-					}).catch(() => {
-						this.$messageBox(this.$t('error.obtainMaxNumberFailed'));
-					});
-				} else {
-					this.numberMessage = '结束时间必须大于开始时间';
-				}
-			} else {
-				this.numberMessage = '';
-			}
-		},
-		permissionTypeChange() {
-			this.formModel.mapId = '';
-			this.formModel.prdCode = '';
-			this.formModel.lessonId = '';
-		},
-		mapChange(mapId) {
-			this.formModel.prdCode = '';
-			this.formModel.lessonId = '';
-			this.mapProductList = [];
-			getPublishMapInfo(mapId).then(resp => {
-				getCommodityMapProduct(resp.data.skinCode).then(rest => {
-					const list = rest.data || [];
-					this.mapProductList = list.map(elem => {
-						return { value: elem.code, label: elem.name };
-					});
-				});
-			});
-		},
-		mapProductChange(prdCode) {
-			this.formModel.lessonId = '';
-			this.filterPublisLessonList = this.publisLessonList.filter(elem => { return elem.mapId == this.formModel.mapId && elem.prdCode == this.formModel.prdCode; });
-		},
-		// 搜索查询input
-		async querySearchAsync(queryString, cb) {
-			// 根据queryString 查询用户 并显示
-			const results = [];
-			if (queryString) {
-				try {
-					const params = {
-						fuzzyParam: queryString
-					};
-					const res = await getDimUserList(params);
-					const list = res.data;
-					list.forEach(item => {
-						const value = {
-							id: item.id,
-							value: `${item.nickname}(${item.name})${item.mobile}`
-						};
-						results.push(value);
-					});
-					cb(results);
-				} catch (error) {
-					cb(results);
-				}
-			} else {
-				cb(results);
-			}
-		},
-		prdSelect(item) {
-			this.formModel.ownerId = item.id;
-		},
-		doShow(data) {
-			this.show = true;
-			this.type = data.type;
-			if (!this.isAdd) {
-				const model = data.item;
-				this.formModel = {
-					permissionType: model.permissionType,
-					mapId: model.mapId,
-					lessonId: model.lessonId,
-					prdCode: model.prdCode,
-					date: [model.startTime, model.endTime],
-					amount: model.amount,
-					ownerId: this.formModel.ownerId,
-					roleName: this.formModel.roleName
-				};
-			}
+                    getTotalRemains(model).then(response => {
+                        this.maxTotal = response.data;
+                        if (this.maxTotal == 0) {
+                            this.numberMessage = '可用权限数量为0';
+                        } else {
+                            this.numberMessage = `（${this.$t('global.remainPermissionNumber')}：${this.maxTotal}）`;
+                        }
+                    }).catch(() => {
+                        this.$messageBox(this.$t('error.obtainMaxNumberFailed'));
+                    });
+                } else {
+                    this.numberMessage = '结束时间必须大于开始时间';
+                }
+            } else {
+                this.numberMessage = '';
+            }
+        },
+        permissionTypeChange() {
+            this.formModel.mapId = '';
+            this.formModel.prdCode = '';
+            this.formModel.lessonId = '';
+        },
+        mapChange(mapId) {
+            this.formModel.prdCode = '';
+            this.formModel.lessonId = '';
+            this.mapProductList = [];
+            getCommodityMapProduct(mapId).then(rest => {
+                const list = rest.data || [];
+                this.mapProductList = list.map(elem => {
+                    return { value: elem.code, label: elem.name };
+                });
+            });
+        },
+        mapProductChange(prdCode) {
+            this.formModel.lessonId = '';
+            this.filterPublisLessonList = this.publisLessonList.filter(elem => { return elem.mapId == this.formModel.mapId && elem.prdCode == this.formModel.prdCode; });
+        },
+        // 搜索查询input
+        async querySearchAsync(queryString, cb) {
+            // 根据queryString 查询用户 并显示
+            const results = [];
+            if (queryString) {
+                try {
+                    const params = {
+                        fuzzyParam: queryString
+                    };
+                    const res = await getDimUserList(params);
+                    const list = res.data;
+                    list.forEach(item => {
+                        const value = {
+                            id: item.id,
+                            value: `${item.nickname}(${item.name})${item.mobile}`
+                        };
+                        results.push(value);
+                    });
+                    cb(results);
+                } catch (error) {
+                    cb(results);
+                }
+            } else {
+                cb(results);
+            }
+        },
+        prdSelect(item) {
+            this.formModel.ownerId = item.id;
+        },
+        doShow(data) {
+            this.show = true;
+            this.type = data.type;
+            if (!this.isAdd) {
+                const model = data.item;
+                this.formModel = {
+                    permissionType: model.permissionType,
+                    mapId: model.mapId,
+                    lessonId: model.lessonId,
+                    prdCode: model.prdCode,
+                    date: [model.startTime, model.endTime],
+                    amount: model.amount,
+                    ownerId: this.formModel.ownerId,
+                    roleName: this.formModel.roleName
+                };
+            }
 
-			this.formModel.amount = 0;
-		},
-		doClose() {
-			this.show = false;
-		},
-		draftRule() {
-			this.$refs.dataform.validateForm(() => {
-				if (this.formModel.amount <= this.maxTotal && this.formModel.amount) {
-					if (this.isAdd) {
-						this.$emit('addRuleForm', {
-							operator: OperatorModel.TRANSFER,
-							permissionType: this.formModel.permissionType,
-							mapId: this.isShowMap ? this.formModel.mapId : '',
-							lessonId: this.isShowLesson ? this.formModel.lessonId : '',
-							prdCode: this.isShowMapProduct ? this.formModel.prdCode : '',
-							startTime: this.formModel.date[0],
-							endTime: this.formModel.date[1],
-							amount: this.formModel.amount,
-							ownerId: this.formModel.ownerId,
-							roleName: this.formModel.roleName
-						});
-					} else {
-						this.$emit('editRuleForm', {
-							operator: OperatorModel.TRANSFER,
-							permissionType: this.formModel.permissionType,
-							mapId: this.isShowMap ? this.formModel.mapId : '',
-							lessonId: this.isShowLesson ? this.formModel.lessonId : '',
-							prdCode: this.isShowMapProduct ? this.formModel.prdCode : '',
-							startTime: this.formModel.date[0],
-							endTime: this.formModel.date[1],
-							amount: this.formModel.amount,
-							ownerId: this.formModel.ownerId,
-							roleName: this.formModel.roleName
-						});
-					}
-					this.doClose();
-				}
-			});
-		}
-	}
+            this.formModel.amount = 0;
+        },
+        doClose() {
+            this.show = false;
+        },
+        draftRule() {
+            this.$refs.dataform.validateForm(() => {
+                if (this.formModel.amount <= this.maxTotal && this.formModel.amount) {
+                    if (this.isAdd) {
+                        this.$emit('addRuleForm', {
+                            operator: OperatorModel.TRANSFER,
+                            permissionType: this.formModel.permissionType,
+                            mapId: this.isShowMap ? this.formModel.mapId : '',
+                            lessonId: this.isShowLesson ? this.formModel.lessonId : '',
+                            prdCode: this.isShowMapProduct ? this.formModel.prdCode : '',
+                            startTime: this.formModel.date[0],
+                            endTime: this.formModel.date[1],
+                            amount: this.formModel.amount,
+                            ownerId: this.formModel.ownerId,
+                            roleName: this.formModel.roleName
+                        });
+                    } else {
+                        this.$emit('editRuleForm', {
+                            operator: OperatorModel.TRANSFER,
+                            permissionType: this.formModel.permissionType,
+                            mapId: this.isShowMap ? this.formModel.mapId : '',
+                            lessonId: this.isShowLesson ? this.formModel.lessonId : '',
+                            prdCode: this.isShowMapProduct ? this.formModel.prdCode : '',
+                            startTime: this.formModel.date[0],
+                            endTime: this.formModel.date[1],
+                            amount: this.formModel.amount,
+                            ownerId: this.formModel.ownerId,
+                            roleName: this.formModel.roleName
+                        });
+                    }
+                    this.doClose();
+                }
+            });
+        }
+    }
 };
 </script>
 
diff --git a/src/views/package/draft/ruleForm.vue b/src/views/package/draft/ruleForm.vue
index 2aef00498..c210cdbf2 100644
--- a/src/views/package/draft/ruleForm.vue
+++ b/src/views/package/draft/ruleForm.vue
@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { listPublishMap, getPublishMapInfo } from '@/api/jmap/map';
+import { listPublishMap } from '@/api/jmap/map';
 import { getPublishLessonList } from '@/api/jmap/lesson';
 import { getCommodityMapProduct } from '@/api/management/mapprd';
 import { packagePermissionDistribute } from '@/api/management/distribute';
@@ -79,187 +79,184 @@ import EditRule from './editRule';
 import CanTransfer from './canDistribute';
 
 export default {
-	name: 'PackRule',
-	components: {
-		EditRule,
-		QrCode,
-		CanTransfer
-	},
-	data() {
-		return {
-			display: 1,
-			urlInfo: {},
-			PermissionTypeList: [],
-			PublisLessonList: [],
-			PublishMapList: [],
-			mapProductList: [],
-			ruleList: []
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 63;
-		}
-	},
-	mounted() {
-		this.loadInitData();
-	},
-	methods: {
-		getSummaries(param) {
-			const { columns, data } = param;
-			const sums = [];
-			columns.forEach((column, index) => {
-				if (index === 0) {
-					sums[index] = this.$t('global.totoal');
-					return;
-				}
+    name: 'PackRule',
+    components: {
+        EditRule,
+        QrCode,
+        CanTransfer
+    },
+    data() {
+        return {
+            display: 1,
+            urlInfo: {},
+            PermissionTypeList: [],
+            PublisLessonList: [],
+            PublishMapList: [],
+            mapProductList: [],
+            ruleList: []
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height - 63;
+        }
+    },
+    mounted() {
+        this.loadInitData();
+    },
+    methods: {
+        getSummaries(param) {
+            const { columns, data } = param;
+            const sums = [];
+            columns.forEach((column, index) => {
+                if (index === 0) {
+                    sums[index] = this.$t('global.totoal');
+                    return;
+                }
 
-				if (index === 6) {
-					const values = data.map(item => Number(item[column.property]));
-					if (!values.every(value => isNaN(value))) {
-						sums[index] = values.reduce((prev, curr) => {
-							const value = Number(curr);
-							if (!isNaN(value)) {
-								return prev + curr;
-							} else {
-								return prev;
-							}
-						}, 0);
-					}
-				}
-			});
+                if (index === 6) {
+                    const values = data.map(item => Number(item[column.property]));
+                    if (!values.every(value => isNaN(value))) {
+                        sums[index] = values.reduce((prev, curr) => {
+                            const value = Number(curr);
+                            if (!isNaN(value)) {
+                                return prev + curr;
+                            } else {
+                                return prev;
+                            }
+                        }, 0);
+                    }
+                }
+            });
 
-			return sums;
-		},
-		computedName(list, code) {
-			let name = '';
-			list.forEach(elem => {
-				if (elem.value == code) {
-					name = elem.label;
-				}
-			});
-			return name;
-		},
-		async computedMapProduct(item) {
-			let name = '';
-			const resp = await getPublishMapInfo(item.mapId);
-			const rest = await getCommodityMapProduct(resp.data.skinCode);
-			const list = rest.data || [];
-			list.forEach(elem => {
-				if (elem.id == item.mapProductCode) {
-					name = elem.name;
-					return;
-				}
-			});
-			return name;
-		},
-		loadInitData() {
-			this.PermissionTypeList = [];
-			this.$Dictionary.permissionType().then(list => {
-				this.PermissionTypeList = list.map(elem => {
-					return { value: elem.code, label: elem.name };
-				});
-			});
+            return sums;
+        },
+        computedName(list, code) {
+            let name = '';
+            list.forEach(elem => {
+                if (elem.value == code) {
+                    name = elem.label;
+                }
+            });
+            return name;
+        },
+        async computedMapProduct(item) {
+            let name = '';
+            const rest = await getCommodityMapProduct(item.mapId);
+            const list = rest.data || [];
+            list.forEach(elem => {
+                if (elem.id == item.mapProductCode) {
+                    name = elem.name;
+                    return;
+                }
+            });
+            return name;
+        },
+        loadInitData() {
+            this.PermissionTypeList = [];
+            this.$Dictionary.permissionType().then(list => {
+                this.PermissionTypeList = list.map(elem => {
+                    return { value: elem.code, label: elem.name };
+                });
+            });
 
-			this.EffectiveTypeList = [];
-			this.$Dictionary.effectiveType().then(list => {
-				this.EffectiveTypeList = list.map(elem => {
-					return { value: elem.code, label: elem.name };
-				});
-			});
+            this.EffectiveTypeList = [];
+            this.$Dictionary.effectiveType().then(list => {
+                this.EffectiveTypeList = list.map(elem => {
+                    return { value: elem.code, label: elem.name };
+                });
+            });
 
-			this.PublishMapList = [];
-			listPublishMap().then(response => {
-				const list = response.data || [];
-				this.PublishMapList = list.map(elem => {
-					return { value: elem.id, label: elem.name };
-				});
-			});
+            this.PublishMapList = [];
+            listPublishMap().then(response => {
+                const list = response.data || [];
+                this.PublishMapList = list.map(elem => {
+                    return { value: elem.id, label: elem.name };
+                });
+            });
 
-			this.PublisLessonList = [];
-			getPublishLessonList().then(response => {
-				const list = response.data || [];
-				this.PublisLessonList = list.map(elem => {
-					return { value: elem.id, label: elem.name, mapId: elem.mapId, prdCode: elem.prdCode };
-				});
-			});
-		},
-		turnback() {
-			this.$router.go(-1);
-		},
-		dialogAdd() {
-			this.$refs.addRule.doShow({ type: 'add' });
-		},
-		dialogEdit(item) {
-			this.$refs.addRule.doShow({ type: 'edit', item: item });
-		},
-		deleteForm(item) {
-			var index = this.ruleList.indexOf(item);
-			if (index >= 0) {
-				this.ruleList.splice(index, 1);
-			}
-		},
-		addRuleForm(item) {
-			const index = this.ruleList.findIndex(elem => {
-				return item.mapId == elem.mapId &&
+            this.PublisLessonList = [];
+            getPublishLessonList().then(response => {
+                const list = response.data || [];
+                this.PublisLessonList = list.map(elem => {
+                    return { value: elem.id, label: elem.name, mapId: elem.mapId, prdCode: elem.prdCode };
+                });
+            });
+        },
+        turnback() {
+            this.$router.go(-1);
+        },
+        dialogAdd() {
+            this.$refs.addRule.doShow({ type: 'add' });
+        },
+        dialogEdit(item) {
+            this.$refs.addRule.doShow({ type: 'edit', item: item });
+        },
+        deleteForm(item) {
+            var index = this.ruleList.indexOf(item);
+            if (index >= 0) {
+                this.ruleList.splice(index, 1);
+            }
+        },
+        addRuleForm(item) {
+            const index = this.ruleList.findIndex(elem => {
+                return item.mapId == elem.mapId &&
                         item.lessonId == elem.lessonId &&
                         item.prdCode == elem.prdCode &&
                         item.permissionType == elem.permissionType;
-			});
-			getPublishMapInfo(item.mapId).then(resp => {
-				getCommodityMapProduct(resp.data.skinCode).then(rest => {
-					const list = rest.data || [];
-					this.mapProductList = list.map(elem => {
-						return { value: elem.code, label: elem.name };
-					});
-				});
-			});
-			if (index < 0) {
-				this.ruleList.push(item);
-			} else {
-				this.$message.warning(this.$t('permission.hasExitRule'));
-			}
-		},
-		editRuleForm(item) {
-			const index = this.ruleList.findIndex(elem => {
-				return item.mapId == elem.mapId &&
+            });
+            getCommodityMapProduct(item.mapId).then(rest => {
+                const list = rest.data || [];
+                this.mapProductList = list.map(elem => {
+                    return { value: elem.code, label: elem.name };
+                });
+            });
+            if (index < 0) {
+                this.ruleList.push(item);
+            } else {
+                this.$message.warning(this.$t('permission.hasExitRule'));
+            }
+        },
+        editRuleForm(item) {
+            const index = this.ruleList.findIndex(elem => {
+                return item.mapId == elem.mapId &&
                         item.lessonId == elem.lessonId &&
                         item.mapProductCode == elem.mapProductCode &&
                         item.permissionType == elem.permissionType;
-			});
+            });
 
-			if (index >= 0) {
-				Object.assign(this.ruleList[index], item);
-			}
-		},
-		packForm() {
-			if (this.ruleList.length) {
-				this.$refs.canDistribute.doShow();
-			} else {
-				this.$messageBox(this.$t('permission.pleaseAddRule'));
-			}
-		},
-		distribute(data) {
-			this.url = '';
-			this.ruleList.forEach(item => {
-				item.canDistribute = data.canDistribute;
-			});
-			packagePermissionDistribute(this.ruleList).then(resp => {
-				this.urlInfo = {
-					url: resp.data,
-					title: this.$t('global.distributeQrcode')
-				};
-				this.qrcodeShow();
-			}).catch(() => {
-				this.$messageBox(this.$t('error.packagePermissionFailed'));
-			});
-		},
-		qrcodeShow() {
-			if (this.$refs) {
-				this.$refs.qrCode.doShow(this.urlInfo);
-			}
-		}
-	}
+            if (index >= 0) {
+                Object.assign(this.ruleList[index], item);
+            }
+        },
+        packForm() {
+            if (this.ruleList.length) {
+                this.$refs.canDistribute.doShow();
+            } else {
+                this.$messageBox(this.$t('permission.pleaseAddRule'));
+            }
+        },
+        distribute(data) {
+            this.url = '';
+            this.ruleList.forEach(item => {
+                item.canDistribute = data.canDistribute;
+            });
+            packagePermissionDistribute(this.ruleList).then(resp => {
+                this.urlInfo = {
+                    url: resp.data,
+                    title: this.$t('global.distributeQrcode')
+                };
+                this.qrcodeShow();
+            }).catch(() => {
+                this.$messageBox(this.$t('error.packagePermissionFailed'));
+            });
+        },
+        qrcodeShow() {
+            if (this.$refs) {
+                this.$refs.qrCode.doShow(this.urlInfo);
+            }
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/systemGenerate/create.vue b/src/views/systemGenerate/create.vue
index 538458591..6a79001b7 100644
--- a/src/views/systemGenerate/create.vue
+++ b/src/views/systemGenerate/create.vue
@@ -1,144 +1,140 @@
 <template>
-    <div>
-        <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
-            <data-form ref="dataform" :form="form" :formModel="formModel" :rules="rules"></data-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="doCreate">{{$t('global.confirm')}}</el-button>
-                <el-button @click="doClose">{{$t('global.cancel')}}</el-button>
-            </span>
-        </el-dialog>
-    </div>
+  <div>
+    <el-dialog :title="title" :visible.sync="dialogVisible" width="500px" :before-close="doClose" center>
+      <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="doCreate">{{ $t('global.confirm') }}</el-button>
+        <el-button @click="doClose">{{ $t('global.cancel') }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
-    import ConstConfig from '@/scripts/ConstConfig';
-    import Cookies from 'js-cookie';
-    import { listPublishMap } from '@/api/jmap/map';
-    import { getCommodityMapProduct } from '@/api/management/mapprd';
-    export default {
-        name: 'OnceGenerate',
-        data() {
-            return {
-                dialogVisible: false,
-                mapList: [],
-                disabled:null,
-                productList:[],
-                mapInfoList:[],
-                projectList:[],
-                typeList:[],
-                formModel:{
-                    mapId:'',
-                    name: "",
-                    prdCode: "",
-                    type: "",
-                    id:null,
-                }
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
+import { listPublishMap } from '@/api/jmap/map';
+import { getCommodityMapProduct } from '@/api/management/mapprd';
+export default {
+    name: 'OnceGenerate',
+    props: {
+        title: String,
+        operateType:String
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            mapList: [],
+            disabled:null,
+            productList:[],
+            mapInfoList:[],
+            projectList:[],
+            typeList:[],
+            formModel:{
+                mapId:'',
+                name: '',
+                prdCode: '',
+                type: '',
+                id:null
             }
-        },
-        mounted() {
-            this.loadInitData();
-        },
-        props: {
-            title: String,
-            operateType:String
-        },
-        computed: {
-            form() {
-                let form={};
-                if(this.operateType=="add"){
-                    form={
-                        labelWidth: '150px',
-                        items: [
-                            { prop: 'customized', label: this.$t('systemGenerate.customized'), type: 'select', required: true,options: this.projectList},
-                            { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true,options: this.mapList,change:true,onChange:this.changeMap},
-                            { prop: 'prdCode', label: this.$t('systemGenerate.prdName'), type: 'select', required: true,options:this.productList},
-                            { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true,},
-                            { prop: 'type', label: this.$t('systemGenerate.type'), type: 'select', required: true,options: this.typeList},
-                        ]
-                    }
-                }
-                else{
-                    form={
-                        labelWidth: '150px',
-                        items: [
-                            { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true,},
-                        ]
-                    }
-                }
-                return form
-            },
-            rules() {
-                let crules ={};
-                if(this.operateType=="add"){
-                    crules ={customized:[
-                            { required: true, message: this.$t('systemGenerate.selectProject'), trigger: 'change'},
-                        ],
-                        mapId:[
-                            { required: true, message: this.$t('systemGenerate.selectMap'), trigger: 'change'},
-                        ],
-                        name: [
-                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
-                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' },
-                        ],
-                        type:[
-                            { required: true, message: this.$t('systemGenerate.selectType'), trigger: 'change'},
-                        ],
-                        prdCode:[
-                            { required: true, message: this.$t('systemGenerate.selectPrdName'), trigger: 'change'},
-                        ]
-                    }
-                }else{
-                    crules ={
-                        name: [
-                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
-                            { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' },
-                        ],
-                    };
-                }
-                return crules
-            },
-        },
-        methods:{
-            loadInitData(){ 
-                this.projectList=[{value:'xty',label:'西铁院'}];
-                let customeredProductType=ConstConfig.ConstSelect.customeredProductType;
-                this.typeList=Cookies.get("user_lang")=="en"?
-                    customeredProductType.map(elem => { return { value: elem.value, label: elem.enlabel } }):
-                    customeredProductType.map(elem => { return { value: elem.value, label: elem.label } });
-                listPublishMap().then(response => {
-                    this.mapInfoList=response.data;
-                    this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name } });
-                })
-            },
-            changeMap(index){
-                this.productList=[];
-                let mapInfo=this.mapInfoList.find(elem=>{
-                    return elem.id==index;
-                });
-                getCommodityMapProduct(mapInfo.skinCode).then((response) => {
-                    this.productList = response.data.map(elem => { return { value: elem.code, label: elem.name } });
-                    this.formModel.prdCode="";
-				});
-            },
-            doShow(data) {
-                if(data){
-                    this.formModel.name=data.name;
-                    this.formModel.id=data.id;
-                }
-                this.dialogVisible = true   
-            },
-            doCreate() {
-                let self = this
-                this.$refs.dataform.validateForm(() => {
-                    self.$emit('create', Object.assign({}, this.formModel));
-                    self.doClose()
-                })
-            },
-            doClose() {
-                this.$refs.dataform.resetForm();
-                this.dialogVisible = false
+        };
+    },
+    computed: {
+        form() {
+            let form = {};
+            if (this.operateType == 'add') {
+                form = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'customized', label: this.$t('systemGenerate.customized'), type: 'select', required: true, options: this.projectList},
+                        { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true, options: this.mapList, change:true, onChange:this.changeMap},
+                        { prop: 'prdCode', label: this.$t('systemGenerate.prdName'), type: 'select', required: true, options:this.productList},
+                        { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true},
+                        { prop: 'type', label: this.$t('systemGenerate.type'), type: 'select', required: true, options: this.typeList}
+                    ]
+                };
+            } else {
+                form = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'name', label: this.$t('systemGenerate.name'), type: 'text', required: true}
+                    ]
+                };
             }
+            return form;
+        },
+        rules() {
+            let crules = {};
+            if (this.operateType == 'add') {
+                crules = {customized:[
+                    { required: true, message: this.$t('systemGenerate.selectProject'), trigger: 'change'}
+                ],
+                mapId:[
+                    { required: true, message: this.$t('systemGenerate.selectMap'), trigger: 'change'}
+                ],
+                name: [
+                    { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
+                    { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' }
+                ],
+                type:[
+                    { required: true, message: this.$t('systemGenerate.selectType'), trigger: 'change'}
+                ],
+                prdCode:[
+                    { required: true, message: this.$t('systemGenerate.selectPrdName'), trigger: 'change'}
+                ]
+                };
+            } else {
+                crules = {
+                    name: [
+                        { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
+                        { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' }
+                    ]
+                };
+            }
+            return crules;
         }
-    };
+    },
+    mounted() {
+        this.loadInitData();
+    },
+    methods:{
+        loadInitData() {
+            this.projectList = [{value:'xty', label:'西铁院'}];
+            const customeredProductType = ConstConfig.ConstSelect.customeredProductType;
+            this.typeList = Cookies.get('user_lang') == 'en'
+                ? customeredProductType.map(elem => { return { value: elem.value, label: elem.enlabel }; })
+                : customeredProductType.map(elem => { return { value: elem.value, label: elem.label }; });
+            listPublishMap().then(response => {
+                this.mapInfoList = response.data;
+                this.mapList = response.data.map(elem => { return { value: elem.id, label: elem.name }; });
+            });
+        },
+        changeMap(index) {
+            this.productList = [];
+            getCommodityMapProduct(index).then((response) => {
+                this.productList = response.data.map(elem => { return { value: elem.code, label: elem.name }; });
+                this.formModel.prdCode = '';
+            });
+        },
+        doShow(data) {
+            if (data) {
+                this.formModel.name = data.name;
+                this.formModel.id = data.id;
+            }
+            this.dialogVisible = true;
+        },
+        doCreate() {
+            const self = this;
+            this.$refs.dataform.validateForm(() => {
+                self.$emit('create', Object.assign({}, this.formModel));
+                self.doClose();
+            });
+        },
+        doClose() {
+            this.$refs.dataform.resetForm();
+            this.dialogVisible = false;
+        }
+    }
+};
 </script>
 <style lang="scss" scoped>
 /deep/ .el-dialog--center .el-dialog__body{

From fa1fc4c3cf91c240f263cf4c5b700ca47bebd842 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Wed, 30 Oct 2019 18:03:30 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=EF=BC=9A/api/mapPrd/tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/baseUrl.js                       |   4 +-
 src/views/components/filterCity/index.vue  | 104 ++++++-------
 src/views/demonstration/list/demonList.vue | 170 ++++++++++-----------
 src/views/system/product/tree.vue          |  33 ++--
 4 files changed, 160 insertions(+), 151 deletions(-)

diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index cbc51f6c4..16e67023d 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -3,9 +3,9 @@ export function getBaseUrl() {
     let BASE_API;
     if (process.env.NODE_ENV === 'development') {
         // BASE_API = 'https://joylink.club/jlcloud';
-        BASE_API = 'https://test.joylink.club/jlcloud';
+        // BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.3.5:9000'; // 袁琪
-        // BASE_API = 'http://192.168.3.6:9000'; // 旭强
+        BASE_API = 'http://192.168.3.6:9000'; // 旭强
         // BASE_API = 'http://192.168.3.41:9000'; // 王兴杰
     } else {
         BASE_API = process.env.VUE_APP_BASE_API;
diff --git a/src/views/components/filterCity/index.vue b/src/views/components/filterCity/index.vue
index be897f2f2..054c57b0e 100644
--- a/src/views/components/filterCity/index.vue
+++ b/src/views/components/filterCity/index.vue
@@ -14,61 +14,61 @@ import { publisMapCityList} from '@/api/designPlatform';
 import localStore from 'storejs';
 
 export default {
-	name: 'FilterCity',
-	props: {
-		size: {
-			type: String,
-			default() {
-				return 'medium';
-			}
-		},
-		filterEmpty: {
-			type: Boolean,
-			default() {
-				return false;
-			}
-		},
-		queryFunction: {
-			type: Function,
-			required: true
-		},
-		localParamName: {
-			type: String,
-			required: true
-		}
-	},
-	data() {
-		return {
-			filterSelect: ['', ''],
-			filterOptions: []
-		};
-	},
-	created() {
-		this.loadInitData();
-	},
-	methods: {
-		async loadInitData() {
-			// 获取城市列表
-			this.filterOptions=[];
+    name: 'FilterCity',
+    props: {
+        size: {
+            type: String,
+            default() {
+                return 'medium';
+            }
+        },
+        filterEmpty: {
+            type: Boolean,
+            default() {
+                return false;
+            }
+        },
+        queryFunction: {
+            type: Function,
+            required: true
+        },
+        localParamName: {
+            type: String,
+            required: true
+        }
+    },
+    data() {
+        return {
+            filterSelect: ['', ''],
+            filterOptions: []
+        };
+    },
+    created() {
+        this.loadInitData();
+    },
+    methods: {
+        async loadInitData() {
+            // 获取城市列表
+            this.filterOptions = [];
 
-			let resp = this.$route.fullPath.includes('design/userlist')?await this.$Dictionary.cityType():await publisMapCityList('city_type');
-			resp=this.$route.fullPath.includes('design/userlist')?resp:resp.data;
-			const cityList = resp.sort((a, b) => {
-				return a.code.localeCompare(b.code);
-			});
+            let resp = this.$route.fullPath.includes('design/userlist') ? await this.$Dictionary.cityType() : await publisMapCityList('city_type');
+            resp = this.$route.fullPath.includes('design/userlist') ? resp : resp.data;
+            const cityList = resp.sort((a, b) => {
+                return a.code.localeCompare(b.code);
+            });
 
-			this.filterOptions=cityList;
-			this.filterSelect = localStore.get(this.localParamName) || cityList[0].code;
+            this.filterOptions = cityList;
+            this.filterSelect = localStore.get(this.localParamName) || cityList[0].code;
 
-			this.$emit('filterSelectChange', this.filterSelect);
-		},
-		filterSelectChange(filterSelect) {
-			// 设置一级选择组件
-			// localStore.set('_cityCode', filterSelect);
-			localStore.set(this.localParamName, filterSelect);
-			this.$emit('filterSelectChange', filterSelect);
-		}
-	}
+            this.$emit('filterSelectChange', this.filterSelect);
+        },
+        filterSelectChange(filterSelect) {
+            // 设置一级选择组件
+            // localStore.set('_cityCode', filterSelect);
+            localStore.set(this.localParamName, filterSelect);
+            this.$emit('filterSelectChange', filterSelect);
+        }
+    }
 };
 </script>
 
diff --git a/src/views/demonstration/list/demonList.vue b/src/views/demonstration/list/demonList.vue
index 58c9f016b..c60d45d40 100644
--- a/src/views/demonstration/list/demonList.vue
+++ b/src/views/demonstration/list/demonList.vue
@@ -21,7 +21,7 @@
           <span
             class="el-icon-tickets"
             :style="{color: data.valid ? 'green':''}"
-          ></span>
+          />
           <span :style="{color: data.valid ? 'green':''}">&nbsp;{{ tnode.label }}</span>
         </span>
       </el-tree>
@@ -35,94 +35,94 @@ import { getSessionStorage, setSessionStorage, removeSessionStorage } from '@/ut
 import FilterCity from '@/views/components/filterCity';
 
 export default {
-	name: 'ExamDetailList',
-	components: {
-		FilterCity
-	},
-	props: {
-		height: {
-			type: Number,
-			required: true
-		}
-	},
-	data() {
-		return {
-			loading: true,
-			defaultShowKeys: [],
-			queryFunction: getPublishMapTree,
-			filterText: '',
-			treeData: [],
-			treeList: [],
-			selected: {},
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			node: {
-			}
-		};
-	},
-	computed: {
-		role() {
-			return this.$store.state.user.roles.includes('04') ||
+    name: 'ExamDetailList',
+    components: {
+        FilterCity
+    },
+    props: {
+        height: {
+            type: Number,
+            required: true
+        }
+    },
+    data() {
+        return {
+            loading: true,
+            defaultShowKeys: [],
+            queryFunction: getPublishMapTree,
+            filterText: '',
+            treeData: [],
+            treeList: [],
+            selected: {},
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            node: {
+            }
+        };
+    },
+    computed: {
+        role() {
+            return this.$store.state.user.roles.includes('04') ||
                     this.$store.state.user.roles.includes('05') ||
                     this.$store.state.user.roles.includes('01');
-		}
-	},
-	watch: {
-		filterText(val) {
-			this.treeList = this.treeData.filter((res) => {
-				return res.name.includes(val);
-			});
-		}
-	},
-	beforeDestroy () {
-		removeSessionStorage('demonList');
-	},
-	methods: {
-		filterNode(value, data) {
-			if (!value) return true;
-			return data.name.indexOf(value) !== -1;
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj) {
-				this.node = node;
-				this.selected = obj;
-			}
-		},
-		clickEvent(obj, data, ele) {
-			if (obj.type == 'Map') {
-				setSessionStorage('demonList', obj.id);
-				this.$router.push({ path: `${UrlConfig.demonstration.detail}/${obj.id}` });
-			}
-		},
-		async refresh(filterSelect) {
-			this.loading = true;
-			this.treeData = this.treeList = [];
-			try {
-				const res = await getPublishMapTree(filterSelect);
-				this.treeData = res.data;
-				this.treeList = this.filterText
-					? res.data.filter(elem => { return elem.name.includes(this.filterText); })
-					: res.data;
+        }
+    },
+    watch: {
+        filterText(val) {
+            this.treeList = this.treeData.filter((res) => {
+                return res.name.includes(val);
+            });
+        }
+    },
+    beforeDestroy () {
+        removeSessionStorage('demonList');
+    },
+    methods: {
+        filterNode(value, data) {
+            if (!value) return true;
+            return data.name.indexOf(value) !== -1;
+        },
+        showContextMenu(e, obj, node, vueElem) {
+            if (obj) {
+                this.node = node;
+                this.selected = obj;
+            }
+        },
+        clickEvent(obj, data, ele) {
+            if (obj.type == 'Map') {
+                setSessionStorage('demonList', obj.id);
+                this.$router.push({ path: `${UrlConfig.demonstration.detail}/${obj.id}` });
+            }
+        },
+        async refresh(filterSelect) {
+            this.loading = true;
+            this.treeData = this.treeList = [];
+            try {
+                const res = await getPublishMapTree(filterSelect);
+                this.treeData = res.data;
+                this.treeList = this.filterText
+                    ? res.data.filter(elem => { return elem.name.includes(this.filterText); })
+                    : res.data;
 
-				if (this.treeData.length > 0) {
-					this.treeData.forEach(v => {
-						v.children = [];
-					});
+                if (this.treeData.length > 0) {
+                    this.treeData.forEach(v => {
+                        v.children = [];
+                    });
 
-				}
-				this.$nextTick(() => {
-					const mapId = getSessionStorage('demonList') || null;
-					this.$refs.tree.setCurrentKey(mapId);
-					this.loading = false;
-				});
-			} catch (error) {
-				this.loading = false;
-				this.$messageBox(this.$t('error.refreshFailed'));
-			}
-		}
-	}
+                }
+                this.$nextTick(() => {
+                    const mapId = getSessionStorage('demonList') || null;
+                    this.$refs.tree.setCurrentKey(mapId);
+                    this.loading = false;
+                });
+            } catch (error) {
+                this.loading = false;
+                this.$messageBox(this.$t('error.refreshFailed'));
+            }
+        }
+    }
 };
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
diff --git a/src/views/system/product/tree.vue b/src/views/system/product/tree.vue
index 93e390135..191460351 100644
--- a/src/views/system/product/tree.vue
+++ b/src/views/system/product/tree.vue
@@ -3,6 +3,7 @@
     <div class="clearfix">
       <span>{{ $t('map.productCategories') }}</span>
     </div>
+    <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
     <el-input v-model="filterText" :placeholder="$t('tip.enterKeywordsFiltering')" clearable />
     <div style="height: calc(100% - 87px);">
       <el-tree
@@ -29,13 +30,18 @@
   </div>
 </template>
 <script>
-import { getProductTree } from '@/api/management/mapprd';
+import { getPublishMapTree } from '@/api/management/mapprd';
+import FilterCity from '@/views/components/filterCity';
 
 export default {
     name: 'TreeOperate',
+    components: {
+        FilterCity
+    },
     data() {
         return {
             loading: true,
+            queryFunction: getPublishMapTree,
             defaultProps: {
                 children: 'children',
                 label: 'name'
@@ -46,7 +52,8 @@ export default {
             point: {
                 x: 0,
                 y: 0
-            }
+            },
+            localParamName: 'product_cityCode'
         };
     },
     watch: {
@@ -54,9 +61,6 @@ export default {
             this.$refs.trainingTree.filter(val);
         }
     },
-    mounted() {
-        this.refresh();
-    },
     methods: {
         filterNode(value, data) {
             if (!value) return true;
@@ -90,14 +94,19 @@ export default {
             }
             return tree;
         },
-        refresh() {
-            getProductTree().then(response => {
-                this.treeData = this.convertTreeData(response.data);
-                this.$nextTick(() => { this.loading = false; });
-            }).catch(() => {
-                this.$messageBox(this.$t('tip.refreshFailure'));
+        async refresh(filterSelect) {
+            console.log(filterSelect, '==========');
+            this.loading = true;
+            try {
+                const res = await getPublishMapTree(filterSelect);
+                this.treeData = this.convertTreeData(res.data);
+                this.$nextTick(() => {
+                    this.loading = false;
+                });
+            } catch (error) {
                 this.loading = false;
-            });
+                this.$messageBox(this.$t('error.refreshFailed'));
+            }
         }
     }
 };