diff --git a/.env.development b/.env.development
index 907d441c5..fd4fb4605 100644
--- a/.env.development
+++ b/.env.development
@@ -7,6 +7,8 @@ NODE_ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.3.4:9000'
 VUE_APP_BASE_API = 'http://192.168.3.6:9000'
 VUE_APP_VOICE_API = 'https://test.joylink.club/jlcloud/'
+# VUE_APP_VOICE_API = 'http://192.168.8.110:9008'
+
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/Jenkinsfile-prd b/Jenkinsfile-prd
index 1bd53bb27..09cd9e7b6 100644
--- a/Jenkinsfile-prd
+++ b/Jenkinsfile-prd
@@ -11,7 +11,6 @@ pipeline {
                 nodejs 'nodejs-10'
             }
             steps {
-                sh 'npm update'
                 sh 'npm install'
                 sh 'npm run build'
             }
diff --git a/Jenkinsfile-test b/Jenkinsfile-test
index fff7d237c..7961d5f98 100644
--- a/Jenkinsfile-test
+++ b/Jenkinsfile-test
@@ -11,7 +11,6 @@ pipeline {
                 nodejs 'nodejs-10'
             }
             steps {
-            	sh 'npm update'
                 sh 'npm install'
                 sh 'npm run test'
             }
diff --git a/package.json b/package.json
index d551ce4d2..2ec416153 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
 		"path-to-regexp": "2.4.0",
 		"qrcode.vue": "^1.6.2",
 		"qs": "^6.9.3",
+		"quill-image-extend-module": "^1.1.2",
 		"recordrtc": "^5.5.9",
 		"script-loader": "^0.7.2",
 		"sessionstorage": "^0.1.0",
diff --git a/src/api/jmap/map.js b/src/api/jmap/map.js
index 9acfc87ba..7a625330d 100644
--- a/src/api/jmap/map.js
+++ b/src/api/jmap/map.js
@@ -236,3 +236,10 @@ export function getNewMapDataByMapId(mapId) {
         method: 'get'
     });
 }
+/** 发布地图根据id生成子系统及权限 */
+export function generateAncillaryData(mapId) {
+    return request({
+        url: `/api/map/${mapId}/function/generate`,
+        method: 'post'
+    });
+}
diff --git a/src/api/learn.js b/src/api/learn.js
new file mode 100644
index 000000000..738eb18cf
--- /dev/null
+++ b/src/api/learn.js
@@ -0,0 +1,84 @@
+import request from '@/utils/request';
+
+// 根据postId帖子ID分页查询留言列表
+export function queryMessagePagingByPostId(postId, params) {
+    return request({
+        url: `/api/learn/${postId}/message/pagedQuery/postId`,
+        method: 'get',
+        params: params
+    });
+}
+// 根据项目分页查询留言列表
+export function queryMessagePagingByProjectCode(projectCode, params) {
+    return request({
+        url: `/api/learn/${projectCode}/message/pagedQuery/project`,
+        method: 'get',
+        params: params
+    });
+}
+// 回复帖子
+export function answerPost(data) {
+    return request({
+        url: `/api/learn/message/create`,
+        method: 'post',
+        data: data
+    });
+}
+// 评论留言
+export function commentLevelMessage(messageId, data) {
+    return request({
+        url: `/api/learn/${messageId}/comment`,
+        method: 'post',
+        data: data
+    });
+}
+// 评论 留言的评论
+export function commentComents(messageId, commentId, data) {
+    return request({
+        url: `/api/learn/${messageId}/${commentId}/comment`,
+        method: 'post',
+        data: data
+    });
+}
+// 管理员删除留言
+export function deleteMessageByAdmin(messageId) {
+    return request({
+        url: `/api/learn/${messageId}/deleteMessage/admin`,
+        method: 'delete'
+    });
+}
+// 用户自己删除留言
+export function deleteMessageBySelf(messageId) {
+    return request({
+        url: `/api/learn/${messageId}/deleteMessage/user`,
+        method: 'delete'
+    });
+}
+// 查询留言的评论列表
+export function queryMessageCommentList(messageId) {
+    return request({
+        url: `/api/learn/${messageId}/list`,
+        method: 'get'
+    });
+}
+// 删除评论回复管理员
+export function deleteCommentByAdmin(commentId) {
+    return request({
+        url: `/api/learn/${commentId}/deleteComment/admin`,
+        method: 'delete'
+    });
+}
+// 删除评论回复用户
+export function deleteCommentBySelf(commentId) {
+    return request({
+        url: `/api/learn/${commentId}/deleteComment/user`,
+        method: 'delete'
+    });
+}
+// 根据项目获取项目关联的帖子
+export function getPostByProjectCode(projectCode) {
+    return request({
+        url: `/api/learn/${projectCode}/post`,
+        method: 'get'
+    });
+}
diff --git a/src/assets/bg_board.jpg b/src/assets/bg_board.jpg
new file mode 100644
index 000000000..57b78a062
Binary files /dev/null and b/src/assets/bg_board.jpg differ
diff --git a/src/assets/delete.png b/src/assets/delete.png
new file mode 100644
index 000000000..a5d3f42fa
Binary files /dev/null and b/src/assets/delete.png differ
diff --git a/src/assets/like.png b/src/assets/like.png
new file mode 100644
index 000000000..d36ee6510
Binary files /dev/null and b/src/assets/like.png differ
diff --git a/src/assets/reply.png b/src/assets/reply.png
new file mode 100644
index 000000000..04215c4a0
Binary files /dev/null and b/src/assets/reply.png differ
diff --git a/src/assets/unlike.png b/src/assets/unlike.png
new file mode 100644
index 000000000..dddf99c85
Binary files /dev/null and b/src/assets/unlike.png differ
diff --git a/src/components/QueryListPage/DataForm.vue b/src/components/QueryListPage/DataForm.vue
index f9edadf9c..f843a0365 100644
--- a/src/components/QueryListPage/DataForm.vue
+++ b/src/components/QueryListPage/DataForm.vue
@@ -183,6 +183,7 @@
               :placeholder="item.placeholder"
               :disabled="item.disabled"
               multiple
+              @change="((val)=>{deviceChange(val, item)})"
             >
               <el-option
                 v-for="option in item.options"
diff --git a/src/components/QuillEditor/index.vue b/src/components/QuillEditor/index.vue
index 2e4bf60d7..a5913a843 100644
--- a/src/components/QuillEditor/index.vue
+++ b/src/components/QuillEditor/index.vue
@@ -4,7 +4,8 @@
       ref="editor"
       v-model="content"
       :options="options"
-      :style="{height: height+'px', 'margin-bottom': '80px'}"
+      style="background-color: #fff"
+      :style="{height: height+'px', 'margin-bottom': marginBottom+'px'}"
       @change="onChange"
       @blur="onBlur"
       @focus="onFocus"
@@ -13,9 +14,10 @@
 </template>
 
 <script>
-import { quillEditor } from 'vue-quill-editor';
+import { quillEditor, Quill } from 'vue-quill-editor';
 import 'quill/dist/quill.snow.css';
-
+import { ImageExtend, QuillWatch} from 'quill-image-extend-module';
+Quill.register('modules/ImageExtend', ImageExtend);
 export default {
     components: {
         quillEditor
@@ -32,12 +34,69 @@ export default {
         placeholder: {
             type: String,
             default: ''
+        },
+        marginBottom: {
+            type: Number,
+            default: 80
+        },
+        unloadImg: {
+            type: Boolean,
+            default: false
+        },
+        noHandleP: {
+        	type: Boolean,
+            defalut: false
         }
     },
     data() {
         return {
-            content: '',
-            options: {
+            content: ''
+        };
+    },
+    computed: {
+        editor() {
+            return this.$refs.editor.quill;
+        },
+        options() {
+            const that = this;
+            return this.unloadImg ? {
+                modules: {
+                    ImageExtend: {
+                        loading: true,
+                        name: 'file',
+                        size: 3,
+                        action: `https://test.joylink.club/jlfile/api/upload/PICTURE?appId=00001&appSecret=joylink00001`,
+                        response: (res) => {
+                            return `https://test.joylink.club/oss/joylink${res.data}`;
+                        },
+                        error: () => { that.$message.error('图片上传失败，请检查网络状态'); },
+                        sizeError: () => { that.$message.error('图片上传失败，图片大小限制3MB'); } // 图片超过大小的回调
+                    },
+                    toolbar: {
+                        container: [
+                            ['bold', 'italic', 'underline', 'strike'],
+                            [],
+                            [],
+                            [{'list': 'ordered'}, {'list': 'bullet'}],
+                            [{'script': 'sub'}, {'script': 'super'}],
+                            [{'indent': '-1'}, {'indent': '+1'}],
+                            [{'direction': 'rtl'}],
+                            [{'size': ['small', 'large', 'huge']}],
+                            [{'color': [], 'background': []}],
+                            [{'font': []}],
+                            [{'align': []}],
+                            ['clean'],
+                            ['image']
+                        ],
+                        handlers: {
+                            'image': function () {
+                                QuillWatch.emit(this.quill.id);
+                            }
+                        }
+                    }
+                },
+                placeholder: '请输入'
+            } : {
                 modules: {
                     toolbar: [
                         ['bold', 'italic', 'underline', 'strike'],
@@ -54,12 +113,7 @@ export default {
                         ['clean']
                     ]
                 }
-            }
-        };
-    },
-    computed: {
-        editor() {
-            return this.$refs.editor.quill;
+            };
         },
         titleConfig () {
             return {
@@ -91,11 +145,13 @@ export default {
     watch: {
         'value': function(val) {
             this.$nextTick(() => {
-                if (val != this.$escapeHTML(this.content)) {
+                if (val != this.$escapeHTML(this.content) && !this.noHandleP) {
                     this.editor.enable(false);
                     this.content = val;
                     this.editor.enable(true);
                     this.editor.blur();
+                } else if (this.noHandleP) {
+                    this.content = val;
                 }
             });
         }
@@ -105,11 +161,18 @@ export default {
     },
     methods: {
         onChange(e) {
-            this.$emit('input', this.$escapeHTML(this.content));
+        	if (!this.noHandleP) {
+                this.$emit('input', this.$escapeHTML(this.content));
+            } else {
+                this.$emit('input', this.content);
+            }
         },
         onBlur(e) {
         },
         onFocus(e) {
+        },
+        getFocus() {
+            this.$refs.editor.quill.focus();
         }
     }
 };
diff --git a/src/i18n/langs/en/display.js b/src/i18n/langs/en/display.js
index 5cef3d6e5..0c9b3d1ff 100644
--- a/src/i18n/langs/en/display.js
+++ b/src/i18n/langs/en/display.js
@@ -55,6 +55,8 @@ export default {
         threeDimensionalView: 'Three-Dimensional View',
         threeDimensionalStation: 'Three-Dimensional Station',
         passengerflow: 'CCTV View',
+        trafficplantext:'Passer Planing',
+        traffictraintext:'Trunk View',
         maintainer: 'Maintainer View',
         deviceView: 'DeviceView',
         taskOperateSuccess: 'Task Operate success',
diff --git a/src/i18n/langs/zh/display.js b/src/i18n/langs/zh/display.js
index a1f631698..73ddee5b5 100644
--- a/src/i18n/langs/zh/display.js
+++ b/src/i18n/langs/zh/display.js
@@ -55,6 +55,8 @@ export default {
         threeDimensionalView: '数字沙盘',
         threeDimensionalStation: '三维车站',
         passengerflow: 'cctv视图',
+        trafficplantext:'车站视角',
+        traffictraintext:'车厢视角',
         maintainer: '设备故障视图',
         deviceView: '设备视图',
         taskOperateSuccess: '任务操作成功',
diff --git a/src/i18n/langs/zh/login.js b/src/i18n/langs/zh/login.js
index bfb2fec32..fc3fdbcd7 100644
--- a/src/i18n/langs/zh/login.js
+++ b/src/i18n/langs/zh/login.js
@@ -9,7 +9,7 @@ export default {
     mobilePhoneNumberOrEmail: '手机号/邮箱',
     password: '密码',
     autoLogin: '自动登录',
-    perfectInformation: '请在琏课堂小程序助手，完善个人信息，设置登录密码，手机号或邮箱。',
+    perfectInformation: '请在玖琏科技小程序，完善个人信息，设置登录密码，手机号或邮箱。',
     unableToLogin: '无法登录?',
     login: '登录',
     enterTheCorrectUserName: '请输入正确的用户名',
diff --git a/src/jlmap3d/edit/config/editassetconfig.js b/src/jlmap3d/edit/config/editassetconfig.js
index 9f8e95bb3..fe2eff174 100644
--- a/src/jlmap3d/edit/config/editassetconfig.js
+++ b/src/jlmap3d/edit/config/editassetconfig.js
@@ -40,7 +40,7 @@ export let driverListConfig = [
     url:''
   },
   {
-    assetname:"三站台",
+    assetname:"特殊站台",
     id:'',
     packageName:'',
     deviceType:'',
@@ -98,7 +98,7 @@ export let sceneListConfig = [
     url:''
   },
   {
-    assetname:"三站台",
+    assetname:"特殊站台",
     id:'',
     packageName:'',
     deviceType:'',
diff --git a/src/jlmap3d/edit/connect/newgetmodels.js b/src/jlmap3d/edit/connect/newgetmodels.js
index bba4b7afd..394cdd47e 100644
--- a/src/jlmap3d/edit/connect/newgetmodels.js
+++ b/src/jlmap3d/edit/connect/newgetmodels.js
@@ -93,9 +93,9 @@ export function getmodels(data) {
       assets.push(assetwaicestation);
 
       let assetstation3 = {
-        assetname:"三站台",
+        assetname:"特殊站台",
         id:"6",
-        packageName:"沙盘驾驶三站台",
+        packageName:"沙盘驾驶特殊站台",
         deviceType:"SimulationStation",
         type:"stationThree",
         url:JL3D_LOCAL_STATIC+"/MODEL/station/station3.FBX"
diff --git a/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js b/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js
index 311f77213..749bf53b3 100644
--- a/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js
+++ b/src/jlmap3d/jl3dpassflow/passerrender/passerrender.js
@@ -38,8 +38,8 @@ export function  PasserRender(mapmode) {
     freeViewRender.initRender(renderer,dom,scene,camerass);
     //
 
-    scope.state = "4views";
-    scope.nowrender = fourViewRender;
+    scope.state = "freeview";
+    scope.nowrender = freeViewRender;
   }
 
   this.changeRenderMode = function(mode){
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
new file mode 100644
index 000000000..4b002d2d5
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/connect/stationconnect.js
@@ -0,0 +1,249 @@
+import StompClient from '@/utils/sock';
+import { getBaseUrl } from '@/utils/baseUrl'
+import { getToken } from '@/utils/auth';
+import store from '@/store/index_APP_TARGET';
+
+// 定于仿真socket接口
+export function PassflowConnect(deviceaction,toptrain,downtrain,routegroup,passerStation,passerAi,jl3d) {
+	const scope = this;
+	this.teststomp = new StompClient();
+	let start = true;
+	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let header = {'X-Token': getToken() };
+	let topswitch = false;
+	let downswitch = false;
+	socketon(topic);
+
+	function socketon(topic) {
+		try {
+			scope.teststomp.subscribe(topic, callback, header);
+		} catch (error) {
+			console.error('websocket订阅失败');
+		}
+
+	};
+
+	this.socketoff = function(topic) {
+		scope.teststomp.unsubscribe(topic);
+	};
+
+	// 仿真socket接口回调函数
+	function callback(Response) {
+		const data = JSON.parse(Response.body);
+
+
+		/** 站台客流当前人数信息 */
+		if(data.type == "STAND_PFI"){
+
+			let newStandData = data.body;
+			let count = 0;
+			for(let j=0;j<passerStation.stationlist.length;j++){
+				count = 0;
+				for(let i=0;i<newStandData.length;i++){
+					if(passerStation.stationlist[j].topstand == newStandData[i].standCode){
+						passerStation.stationlist[j].topspeed = newStandData[i].to;
+						passerStation.stationlist[j].toppassers = newStandData[i].num;
+						count++;
+					}
+					if(passerStation.stationlist[j].downstand == newStandData[i].standCode){
+						passerStation.stationlist[j].downspeed = newStandData[i].to;
+						passerStation.stationlist[j].downpassers = newStandData[i].num;
+						count++;
+					}
+
+					if(count == 2){
+						i = newStandData.length;
+					}
+				}
+			}
+
+			jl3d.updateNowStationData();
+
+			if(start){
+				start = false;
+				jl3d.initTrafficStart();
+			}
+
+			// jl3d.allStationData = data.body;
+		}
+
+		if(data.type == "TRAIN_PFI_BL"){
+
+			if(toptrain.nowcode == data.body.code && topswitch == true){
+				console.log(data);
+				//根据上下车人数创建人
+				jl3d.updateNowLeaveData("top",data.body.out);
+			}
+			if(downtrain.nowcode == data.body.code && downswitch == true){
+				console.log(data);
+				//根据上下车人数创建人
+				jl3d.updateNowLeaveData("down",data.body.out);
+			}
+		}
+
+
+		if(data.type == "DeviceCtrl_3D"){
+			if(data.body.type == "PSD"){
+
+				if(data.body.code == passerStation.nowStation.toppsd){
+					if(data.body.open == 0){
+						passerAi.passerout("top","end");
+						deviceaction.top.action.reset();
+						deviceaction.top.action.time =deviceaction.top.action._clip.duration;
+						deviceaction.top.action.timeScale = -1;
+						deviceaction.top.action.play();
+
+					}else{
+						passerAi.passerout("top","start")
+						deviceaction.top.action.reset();
+						deviceaction.top.action.time = 0;
+						deviceaction.top.action.timeScale = 1;
+						deviceaction.top.action.play();
+					}
+				}
+				if(data.body.code == passerStation.nowStation.downpsd){
+					if(data.body.open == 0){
+
+						deviceaction.down.action.reset();
+						deviceaction.down.action.time = deviceaction.down.action._clip.duration;
+						deviceaction.down.action.timeScale = -1;
+						deviceaction.down.action.play();
+						passerAi.passerout("down","end");
+					}else{
+
+						deviceaction.down.action.reset();
+						deviceaction.down.action.time = 0;
+						deviceaction.down.action.timeScale = 1;
+						deviceaction.down.action.play();
+						passerAi.passerout("down","start");
+					}
+
+				}
+			}
+
+			if(data.body.type == "TRAIN_DOOR"){
+
+				if(toptrain.nowcode == data.body.code){
+
+					if(data.body.open == "0"){
+						closetraindoor(toptrain,data.body.doorCode,"top");
+
+					}else{
+						opentraindoor(toptrain,data.body.doorCode,"top");
+
+					}
+
+				}
+				if(downtrain.nowcode == data.body.code){
+					// console.log(data.body);
+					if(data.body.open == "0"){
+						closetraindoor(downtrain,data.body.doorCode,"down");
+
+					}else{
+						opentraindoor(downtrain,data.body.doorCode,"down");
+
+					}
+
+				}
+			}
+		}
+
+		if(data.type == "TrainRun_3D"){
+
+			for(let i=0,leni = data.body.length;i<leni;i++){
+				if(data.body[i].section == passerStation.nowStation.topsection){
+					if(toptrain.nowcode != data.body[i].code){
+						toptrain.nowcode = data.body[i].code;
+						topswitch = true;
+					}
+					toptrain.position.copy(toptrain.curve.getPointAt(data.body[i].offset));
+
+
+				}else{
+					if(downtrain.nowcode == data.body[i].code){
+						topswitch = false
+						toptrain.position.x -= 1;
+					}
+
+				}
+
+				if(data.body[i].section == passerStation.nowStation.downsection){
+					if(downtrain.nowcode != data.body[i].code){
+						downtrain.nowcode = data.body[i].code;
+						downswitch = true;
+					}
+					downtrain.position.copy(downtrain.curve.getPointAt(data.body[i].offset));
+
+				}else{
+					if(downtrain.nowcode == data.body[i].code){
+						downswitch = false;
+						downtrain.position.x += 1;
+					}
+
+				}
+			}
+		}
+		if(data.type == 'Simulation_Over') {
+			store.dispatch('LogOut').then(() => {
+				location.reload();
+			});
+		}
+	}
+	let actions;
+
+	function opentraindoor(train,doorcode,direct){
+		// console.log(train);
+		if(direct == "top"){
+			// if(doorcode == "1"){
+			// 	actions = train.action.down;
+			// }
+			//
+			// if(doorcode == "2"){
+				actions = train.action.top;
+			// }
+		}else{
+			// if(doorcode == "1"){
+				actions = train.action.top;
+			// }
+			//
+			// if(doorcode == "2"){
+				// actions = train.action.down;
+			// }
+		}
+
+		for(let an=actions.length-1;an>=0;an--){
+			actions[an].reset();
+			actions[an].time = 0;
+			actions[an].timeScale = 1;
+			actions[an].play();
+		}
+	}
+	function closetraindoor(train,doorcode,direct){
+
+		if(direct == "top"){
+			// if(doorcode == "1"){
+			// 	actions = train.action.down;
+			// }
+			// if(doorcode == "2"){
+				actions = train.action.top;
+			// }
+			toptrain.nowcode = null;
+		}else{
+			// if(doorcode == "1"){
+				actions = train.action.top;
+			// }
+			// if(doorcode == "2"){
+				// actions = train.action.down;
+			// }
+			downtrain.nowcode = null;
+		}
+
+		for(let an=actions.length-1;an>=0;an--){
+			actions[an].reset();
+			actions[an].time = actions[an]._clip.duration;
+			actions[an].timeScale = -1;
+			actions[an].play();
+		}
+
+	}
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
new file mode 100644
index 000000000..6caff6cac
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/connect/trainconnect.js
@@ -0,0 +1,166 @@
+import StompClient from '@/utils/sock';
+import { getBaseUrl } from '@/utils/baseUrl'
+import { getToken } from '@/utils/auth';
+import store from '@/store/index_APP_TARGET';
+
+// 定于仿真socket接口
+export function TrainConnect(trafficTrain,deviceaction,toptrain,routegroup,passerAi) {
+	const scope = this;
+	this.teststomp = new StompClient();
+
+	let topic = '/user/queue/simulation/jl3d/'+routegroup;
+	let header = {'X-Token': getToken() };
+
+	socketon(topic);
+
+	function socketon(topic) {
+		try {
+			scope.teststomp.subscribe(topic, callback, header);
+		} catch (error) {
+			console.error('websocket订阅失败');
+		}
+
+	};
+
+	this.socketoff = function(topic) {
+		scope.teststomp.unsubscribe(topic);
+	};
+
+	// 仿真socket接口回调函数
+	function callback(Response) {
+		const data = JSON.parse(Response.body);
+
+
+		if(data.type == "TrainRun_3D"){
+			trafficTrain.runList = data.body;
+			// console.log(data);
+		}
+
+		if(data.type == "BeAbout2Arrive_3D"){
+			if(toptrain.nowcode == data.body.groupNumber){
+				// console.log(data);
+			}
+
+		}
+		if(data.type == "TRAIN_PFI_BL"){
+
+			trafficTrain.updateTrainData(data.body);
+
+
+			// if(toptrain.nowcode == data.body.code){
+			// 	console.log(data);
+			// 	//根据上下车人数创建人
+			// 	jl3d.updateNowLeaveData("top",data.body.out);
+			// }
+			// if(downtrain.nowcode == data.body.code){
+			// 	console.log(data);
+			// 	//根据上下车人数创建人
+			// 	jl3d.updateNowLeaveData("down",data.body.out);
+			// }
+		}
+		if(data.type == "TRAIN_PFI_NUM"){
+
+			trafficTrain.trainList = [];
+			// trafficTrain.trainList = data.body;
+
+			for(let i=0;i<data.body.length;i++){
+				let train = {
+					code:data.body[i].code,
+					num:data.body[i].num,
+					doorCode:1,
+					open:0,
+					text:"",
+				};
+
+				train.text = data.body[i].code+"(现有乘客"+data.body[i].num+"人)";
+
+				trafficTrain.trainList[train.code] = train;
+			}
+		}
+
+		if(data.type == "DeviceCtrl_3D"){
+
+			if(data.body.type == "TRAIN_DOOR"){
+				for(let i=0;i<trafficTrain.trainList.length;i++){
+					if(trafficTrain.trainList[i].code == data.body.code){
+						trafficTrain.trainList[i].open = data.body.open;
+						trafficTrain.trainList[i].doorCode = data.body.doorCode;
+						i = trafficTrain.trainList.length;
+					}
+				}
+				if(toptrain.nowcode == data.body.code){
+					trafficTrain.updatePasserMove(data.body);
+					if(data.body.open == "0"){
+						closetraindoor(toptrain,data.body.doorCode,"top");
+
+					}else{
+						opentraindoor(toptrain,data.body.doorCode,"top");
+
+					}
+
+				}
+
+			}
+		}
+
+		if(data.type == 'Simulation_Over') {
+			store.dispatch('LogOut').then(() => {
+				location.reload();
+			});
+		}
+	}
+	let actions;
+
+	function opentraindoor(train,doorcode,direct){
+
+		if(direct == "top"){
+			if(doorcode == "1"){
+				actions = train.action.down;
+			}
+
+			if(doorcode == "2"){
+				actions = train.action.top;
+			}
+		}else{
+			if(doorcode == "1"){
+				actions = train.action.top;
+			}
+
+			if(doorcode == "2"){
+				actions = train.action.down;
+			}
+		}
+		for(let an=actions.length-1;an>=0;an--){
+			actions[an].reset();
+			actions[an].time = 0;
+			actions[an].timeScale = 1;
+			actions[an].play();
+		}
+	}
+	function closetraindoor(train,doorcode,direct){
+
+		if(direct == "top"){
+			if(doorcode == "1"){
+				actions = train.action.down;
+			}
+			if(doorcode == "2"){
+				actions = train.action.top;
+			}
+		}else{
+			if(doorcode == "1"){
+				actions = train.action.top;
+			}
+			if(doorcode == "2"){
+				actions = train.action.down;
+			}
+		}
+
+		for(let an=actions.length-1;an>=0;an--){
+			actions[an].reset();
+			actions[an].time = actions[an]._clip.duration;
+			actions[an].timeScale = -1;
+			actions[an].play();
+		}
+
+	}
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js b/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
new file mode 100644
index 000000000..8e2a8ea83
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js
@@ -0,0 +1,439 @@
+import { Staticmodel } from '@/jlmap3d/jl3dtrafficplan/loader/stationconfig.js';
+//静态资源文件路劲
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+//loader
+import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
+//轨道视角控制
+import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
+//模型管理器
+import { ModelManager } from '@/jlmap3d/jl3dtrafficplan/loader/loader.js';
+//骨骼动画模型辅助工具
+import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
+//获取信息接口
+import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
+//cctv站台对象
+import { PasserStation } from '@/jlmap3d/jl3dtrafficplan/model/passerstation.js';
+//cctv检票机对象
+import { PasserCheckDoor } from '@/jlmap3d/jl3dtrafficplan/model/passercheckdoor.js';
+//cctv列车对象
+import { PasserTrain } from '@/jlmap3d/jl3dtrafficplan/model/passertrain.js';
+//cctv行人对象
+import { PasserHuman } from '@/jlmap3d/jl3dtrafficplan/model/passerhuman.js';
+//cctv渲染器
+import { PasserRender } from '@/jlmap3d/jl3dpassflow/passerrender/passerrender.js';
+//cctv行人ai
+import { PasserAi } from '@/jlmap3d/jl3dtrafficplan/passerai/passerai.js';
+//行人寻路相关工具
+import { ZoneManager } from '@/jlmap3d/jl3dtrafficplan/model/zonemanager.js';
+import { PathFinder } from '@/jlmap3d/jl3dtrafficplan/passerai/pathfinder.js';
+//cctv通信工具
+import { PassflowConnect } from '@/jlmap3d/jl3dtrafficplan/connect/stationconnect.js';
+
+import StompClient from '@/utils/sock';
+import store from '@/store/index_APP_TARGET';
+// import { Loading } from 'element-ui';
+import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
+
+//动画播放相关
+let clock = new THREE.Clock();
+let delta;
+
+let scene,camerass,renderer;
+
+let aiswitch = 0;
+//动画组
+let mixers = [];
+//车站摄像机模型
+let monitor;
+
+//寻路相关对象
+let passerZone = new ZoneManager();
+let pathFinder = new PathFinder();
+let path;
+
+//设备动画action组
+let deviceaction = [];
+//控制帧率的webworker线程
+let passerWebWork = new Worker(JL3D_LOCAL_STATIC+"/workertest/trafficplan/trafficstation.js");
+
+//老版本临时ai控制
+let olddataai = false;
+
+export function Jl3dTrafficPlan(dom,skinCode,routegroup,viewMap) {
+
+	// let stats = new Stats();
+	// dom.appendChild( stats.dom );
+
+	let scope = this;
+
+	this.dom = dom;
+	this.nowcode = null;
+	this.animateswitch = false;
+	this.signallights = [];
+	this.mixers = [];
+	this.showmodel = null;
+
+	this.allStationData = [];
+	this.humanWaitTop = 0;
+	this.humanWaitDown = 0;
+	this.humanInSpeed = 0;
+	this.humanOutSpeed = 0;
+	let waitForCreatIn = [];
+	let waitForCreatOutTop = [];
+	let waitForCreatOutDown = [];
+	//定义相机
+	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
+	camerass.position.set(0, 80, 40);
+	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
+	camerass.updateProjectionMatrix();
+
+	//定义场景(渲染容器)
+	scene = new THREE.Scene();
+	scene.background = new THREE.Color(0xa0a0a0);
+
+	let passerRender = new PasserRender(viewMap);
+	passerRender.initView(dom,scene,camerass);
+
+	//定义全局光
+	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
+	scene.add(ambientLight);
+
+	let controls = new THREE.OrbitControls(camerass, dom);
+	controls.maxPolarAngle = Math.PI / 2;
+	controls.minPolarangle = Math.PI / 5;
+	controls.maxDistance = 800;
+	controls.screenSpacePanning = true;
+	controls.update();
+	this.selectmodel = null;
+
+	// let mouse = new THREE.Vector2();
+	let raycaster = new THREE.Raycaster();
+
+	//进站运动中乘客
+	let humanlist = new THREE.Group();
+	//上行等待上车乘客
+	let topWaitPassers = new THREE.Group();
+	//下行等待上车乘客
+	let downWaitPassers = new THREE.Group();
+	//出站乘客
+	let outStationPassers = new THREE.Group();
+
+	let passerHuman = new PasserHuman();
+
+	let passerAi = new PasserAi(passerZone,pathFinder);
+
+	this.anime = null;
+
+	this.modelmanager = new ModelManager();
+  // let loadingInstance = Loading.service({ fullscreen: true });
+
+	let stationlist = [];
+	let socktest = null;
+	let passerStation = new PasserStation();
+	let passerCheckDoor = new PasserCheckDoor();
+	let passerTrain = new PasserTrain();
+
+	// document.addEventListener( "mousedown", onselect, false );
+
+	getPublish3dMapDetail(skinCode).then(netdata3d => {
+		passerStation.loadMaterial(netdata3d);
+		this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) {
+			// console.log(scope.modelmanager.station.mesh.getObjectByName("top"));
+			// let testtop = scope.modelmanager.station.mesh.getObjectByName("down");
+			// for(let i=0;i<testtop.children.length;i++){
+			// 	console.log(testtop.children[i].matrixWorld.elements[12]);
+			// 	console.log(testtop.children[i].matrixWorld.elements);
+			// }
+			// console.log(scope.modelmanager.station.mesh.getObjectByName("down"));
+			passerStation.initStationAnimation(scope.modelmanager.station.mesh,mixers,deviceaction,scene);
+			passerCheckDoor.initCheckDoorInAnimation(scope.modelmanager.zhajiin.mesh,mixers,deviceaction,scene);
+			passerCheckDoor.initCheckDoorOutAnimation(scope.modelmanager.zhajiout.mesh,mixers,deviceaction,scene);
+
+			passerTrain.initTrain(scope.modelmanager.train.mesh,mixers,deviceaction,scene);
+
+			scene.add(scope.modelmanager.section.mesh);
+
+			monitor = scope.modelmanager.monitor.mesh;
+			scene.add(monitor);
+
+			getPublishMapDetail(skinCode).then(netdata => {
+
+				scope.switchviews('freeview');
+				passerHuman.initHumans(scope.modelmanager.man1.mesh,scope.modelmanager.man2.mesh);
+				scene.add(humanlist);
+				scene.add(topWaitPassers);
+				scene.add(downWaitPassers);
+				scene.add(outStationPassers);
+
+				passerStation.initStationList(netdata.data.stationList,netdata.data.stationStandList,netdata.data.psdList);
+				socktest = new PassflowConnect(deviceaction,passerTrain.toptrain,passerTrain.downtrain,routegroup,passerStation,passerAi,scope);
+
+				store.dispatch('app/animationsClose');
+
+				let checkobject = setInterval(function(){
+
+					clearInterval(checkobject);
+
+					//进站控制
+					startWorker();
+					passerWebWork.postMessage(["on"]);
+				},1000);
+			});
+
+			animate();
+		})
+	});
+
+	this.initTrafficStart = function(){
+
+		scope.humanWaitTop = passerStation.nowStation.toppassers;
+		scope.humanWaitDown = passerStation.nowStation.downpassers;
+		scope.humanInSpeed = 0;
+		scope.humanOutSpeed = 0;
+		passerHuman.speed = scope.humanInSpeed;
+		passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
+
+		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
+	}
+
+	this.changestation = function(stationname){
+		passerStation.changestation(stationname);
+		scope.humanWaitTop = passerStation.nowStation.toppassers;
+		scope.humanWaitDown = passerStation.nowStation.downpassers;
+		passerHuman.speed = passerStation.nowStation.topspeed + passerStation.nowStation.downspeed;
+		updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
+
+		scope.resetscene();
+	}
+
+	this.updateNowStationData = function(){
+		for(let i=0;i<passerStation.nowStation.topspeed;i++){
+			let newIn = {
+				overGoal:"top",
+			};
+			waitForCreatIn.push(newIn);
+		}
+		for(let i=0;i<passerStation.nowStation.downspeed;i++){
+			let newIn = {
+				overGoal:"down",
+			};
+			waitForCreatIn.push(newIn);
+		}
+
+
+		scope.humanInSpeed = passerStation.nowStation.topspeed+passerStation.nowStation.downspeed;
+		passerHuman.speed = scope.humanInSpeed;
+		passerWebWork.postMessage(["changespeed",scope.humanInSpeed/30]);
+	}
+
+	this.updateNowLeaveData = function(direct,outNum){
+		if(direct == "top"){
+			waitForCreatOutTop = getnum(outNum,17);
+			console.log(waitForCreatOutTop);
+			for(let i=0;i<waitForCreatOutTop.length;i++){
+				for(let j=0;j<waitForCreatOutTop[i];j++){
+					setTimeout(function(){
+						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standtop"].doorpoints[i],5,"top",i);
+					}, Math.random()*1000*j);
+				}
+			}
+		}else{
+			waitForCreatOutDown = getnum(outNum,17);
+			for(let i=0;i<waitForCreatOutDown.length;i++){
+				for(let j=0;j<waitForCreatOutDown[i];j++){
+					setTimeout(function(){
+						passerHuman.newHumanCreate(outStationPassers,passerZone.list["standdown"].doorpoints[j],5,"down",j);
+					}, Math.random()*1000*i);
+				}
+			}
+		}
+	}
+
+	this.resetscene = function(){
+		aiswitch = 1;
+		passerAi.toppasserin = false;
+		passerAi.downpasserin = false;
+		//下车控制开关
+		passerAi.toppasseron = false;
+		passerAi.downpasseron = false;
+
+		passerTrain.toptrain.nowcode = null;
+		passerTrain.downtrain.nowcode = null;
+		// humanlist = new THREE.Group();
+		for(let j=0; j<humanlist.children.length;j++){
+
+			humanlist.remove(humanlist.children[j]);
+			j--;
+			// j--;
+		}
+
+		for(let j=0; j<topWaitPassers.children.length;j++){
+
+			topWaitPassers.remove(topWaitPassers.children[j]);
+			j--;
+			// j--;
+		}
+		for(let j=0; j<downWaitPassers.children.length;j++){
+
+			downWaitPassers.remove(downWaitPassers.children[j]);
+			j--;
+			// j--;
+		}
+		for(let j=0; j<outStationPassers.children.length;j++){
+
+			outStationPassers.remove(outStationPassers.children[j]);
+			j--;
+			// j--;
+		}
+
+
+
+		passerTrain.toptrain.position.y = -20000;
+		passerTrain.downtrain.position.y = -20000;
+
+		deviceaction.down.action.reset();
+		deviceaction.down.action.time = deviceaction.down.action._clip.duration;
+		deviceaction.down.action.timeScale = -1;
+		deviceaction.down.action.play();
+
+		deviceaction.top.action.reset();
+		deviceaction.top.action.time = deviceaction.down.action._clip.duration;
+		deviceaction.top.action.timeScale = -1;
+		deviceaction.top.action.play();
+		for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+			passerTrain.toptrain.action.top[an].reset();
+			passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
+			passerTrain.toptrain.action.top[an].timeScale = -1;
+			passerTrain.toptrain.action.top[an].play();
+		}
+		for(let an=passerTrain.toptrain.action.down.length-1;an>=0;an--){
+			passerTrain.toptrain.action.down[an].reset();
+			passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.down[an]._clip.duration;
+			passerTrain.toptrain.action.down[an].timeScale = -1;
+			passerTrain.toptrain.action.down[an].play();
+		}
+		// for(let an=actions.length-1;an>=0;an--){
+		// 	actions[an].reset();
+		// 	actions[an].time = actions[an]._clip.duration;
+		// 	actions[an].timeScale = -1;
+		// 	actions[an].play();
+		// }
+		setTimeout(function(){
+			passerAi.initPasser(humanlist,topWaitPassers,downWaitPassers,passerHuman,scope);
+			aiswitch = 0;
+		}, 2000);
+
+	}
+
+	function startWorker(){
+
+		let updateaianimate = setInterval(
+			function(){
+				// console.log("?");
+				if(aiswitch == 0){
+					updatePasserData(humanlist.children.length,topWaitPassers.children.length,downWaitPassers.children.length,outStationPassers.children.length,passerHuman.speed);
+
+					passerHuman.moveAnimateUpdate(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman);
+					passerAi.aiUpdate(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman,passerCheckDoor,deviceaction);
+					// passerZone.zoneActionCheck(humanlist,passerHuman,passerCheckDoor,deviceaction);
+					delta = clock.getDelta();
+
+					for(let i=mixers.length-1;i>=0;i--){
+					 if(mixers[i]._actions[0].isRunning()){
+						 mixers[i].update( delta );
+					 }
+					}
+					for(let i=topWaitPassers.children.length-1;i>=0;i--){
+					 if(topWaitPassers.children[i].mixer._actions[0].isRunning()){
+						 topWaitPassers.children[i].mixer.update( delta );
+					 }
+					}
+					for(let i=downWaitPassers.children.length-1;i>=0;i--){
+					 if(downWaitPassers.children[i].mixer._actions[0].isRunning()){
+						 downWaitPassers.children[i].mixer.update( delta );
+					 }
+					}
+					for(let i=outStationPassers.children.length-1;i>=0;i--){
+					 if(outStationPassers.children[i].mixer._actions[0].isRunning()){
+						 outStationPassers.children[i].mixer.update( delta );
+					 }
+					}
+					for(let i=humanlist.children.length-1;i>=0;i--){
+					 if(humanlist.children[i].mixer._actions[0].isRunning()){
+						 humanlist.children[i].mixer.update( delta );
+					 }
+					}
+				}
+			}
+		, 100);
+
+		passerWebWork.onmessage = function (event) {
+			if(aiswitch == 0){
+				// console.log(humanlist.children.length);
+
+				this.allStationData = [];
+				if(waitForCreatIn.length>0){
+					let direct = Math.floor(Math.random()*(3-1+1))+1;
+					//1--top
+					//2-- down
+					if(direct == 1){
+						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter1"),0,waitForCreatIn[0].overGoal);
+					}else{
+						passerHuman.newHumanCreate(humanlist,passerZone.getzoneposition("enter2"),0,waitForCreatIn[0].overGoal);
+					}
+					waitForCreatIn.shift();
+				}
+			}
+		};
+	}
+	//
+	// function onselect(event){
+	// 	if(event.button == '0'){
+	//
+	// 			//定义光线
+	// 			let raycaster = new THREE.Raycaster();
+	// 			//定义平面鼠标点击坐标
+	// 			let mouse = new THREE.Vector2();
+	// 			mouse.x = (event.clientX /  scope.dom.offsetWidth) * 2 - 1;
+	// 			mouse.y = -(event.clientY / scope.dom.offsetHeight) * 2 + 1;
+	//
+	// 			raycaster.setFromCamera( mouse, camerass );
+	//
+	// 			let intersects = raycaster.intersectObject(scope.modelmanager.station.mesh,true);
+	// 			console.log(intersects[0].point);
+	// 	}
+	// }
+
+
+	//循环渲染函数
+	function animate() {
+		passerRender.update();
+
+		// if(passerRender.state == "freeview"){
+			controls.update();
+		// }
+		// delta = clock.getDelta();
+		requestAnimationFrame(animate);
+
+	}
+
+	window.onresize = function () {
+		passerRender.reSize(scope.dom.offsetWidth,scope.dom.offsetHeight);
+	}
+
+	this.switchviews = function(viewmode){
+		passerRender.changeRenderMode(viewmode);
+	}
+
+	function getnum(num,pnum){
+		let re = [];
+		let base = Math.floor(num/pnum);
+		let reset = num%pnum;
+		for(let i=0;i<pnum;i++){
+			let nownum = base+(i<reset?1:0);
+			re.push(nownum);
+		}
+		return re;
+	}
+
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js b/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js
new file mode 100644
index 000000000..76eaca314
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js
@@ -0,0 +1,404 @@
+import { Staticmodel } from '@/jlmap3d/jl3dtrafficplan/loader/trainconfig.js';
+//静态资源文件路劲
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+//loader
+import { FBXLoader } from '@/jlmap3d/main/loaders/FBXLoader';
+//轨道视角控制
+import { OrbitControls } from '@/jlmap3d/main/control/OrbitControls';
+//模型管理器
+import { ModelManager } from '@/jlmap3d/jl3dtrafficplan/loader/loader.js';
+//骨骼动画模型辅助工具
+import { SkeletonUtils } from '@/jlmap3d/main/utils/SkeletonUtils.js';
+//获取信息接口
+import { getPublishMapVersion, getPublishMapDetail,getPublish3dMapDetail} from '@/api/jlmap3d/load3ddata';
+
+//cctv列车对象
+import { PasserTrain } from '@/jlmap3d/jl3dtrafficplan/model/passertrain.js';
+//cctv行人对象
+import { PasserHuman } from '@/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js';
+//cctv渲染器
+import { PasserRender } from '@/jlmap3d/jl3dpassflow/passerrender/passerrender.js';
+//cctv行人ai
+import { PasserAi } from '@/jlmap3d/jl3dpassflow/passerai/passerai.js';
+//行人寻路相关工具
+import { ZoneManager } from '@/jlmap3d/jl3dtrafficplan/model/zonemanager.js';
+import { PathFinder } from '@/jlmap3d/jl3dpassflow/passerai/pathfinder.js';
+//cctv通信工具
+import { TrainConnect } from '@/jlmap3d/jl3dtrafficplan/connect/trainconnect.js';
+
+import StompClient from '@/utils/sock';
+import store from '@/store/index_APP_TARGET';
+// import { Loading } from 'element-ui';
+import {Stats} from '@/jlmap3d/main/lib/stats.min.js';
+
+//动画播放相关
+let clock = new THREE.Clock();
+let delta;
+
+let scene,camerass,renderer;
+
+let aiswitch = 0;
+//动画组
+let mixers = [];
+
+//寻路相关对象
+let passerZone = new ZoneManager();
+let pathFinder = new PathFinder();
+let path;
+
+//设备动画action组
+let deviceaction = [];
+//控制帧率的webworker线程
+let passerWebWork = new Worker(JL3D_LOCAL_STATIC+"/workertest/passsimulation/station.js");
+
+//老版本临时ai控制
+let olddataai = false;
+
+export function Jl3dTrafficTrain(dom,skinCode,routegroup,viewMap) {
+
+	// let stats = new Stats();
+	// dom.appendChild( stats.dom );
+
+	let scope = this;
+
+	this.dom = dom;
+	this.nowcode = null;
+	this.animateswitch = false;
+	this.signallights = [];
+	this.mixers = [];
+	this.showmodel = null;
+
+	this.nowTrainCode = "";
+	this.nowTrunk = {
+		code:null,
+		index:null,
+		numList:[
+
+		]
+	};
+	this.trainList = [];
+
+	this.humanWaitIn = [];
+  this.humanWaitOut = [];
+  this.humanInSpeed = 0;
+  this.humanOutSpeed = 0;
+
+	this.runList = [];
+	//定义相机
+	camerass = new THREE.PerspectiveCamera(70, dom.offsetWidth / dom.offsetHeight, 0.01, 1000);
+	camerass.position.set(0, 80, 40);
+	camerass.aspect = dom.offsetWidth / dom.offsetHeight;
+	camerass.updateProjectionMatrix();
+
+	//定义场景(渲染容器)
+	scene = new THREE.Scene();
+	scene.background = new THREE.Color(0xa0a0a0);
+
+	let passerRender = new PasserRender(viewMap);
+	passerRender.initView(dom,scene,camerass);
+
+	//定义全局光
+	let ambientLight = new THREE.AmbientLight(0xffffff, 1.3);
+	scene.add(ambientLight);
+
+	let controls = new THREE.OrbitControls(camerass, dom);
+	controls.maxPolarAngle = Math.PI / 2;
+	controls.minPolarangle = Math.PI / 5;
+	controls.maxDistance = 800;
+	controls.screenSpacePanning = true;
+
+	camerass.position.x = 4.78;
+	camerass.position.y = 5.076;
+	camerass.position.z = -0.016;
+	controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+	controls.update();
+	controls.enabled = false;
+
+	this.selectmodel = null;
+	// let mouse = new THREE.Vector2();
+	let raycaster = new THREE.Raycaster();
+
+	let humanlist = new THREE.Group();
+	let passerHuman = new PasserHuman();
+
+	let passerAi = new PasserAi(passerZone,pathFinder);
+
+	this.anime = null;
+
+	this.modelmanager = new ModelManager();
+  // let loadingInstance = Loading.service({ fullscreen: true });
+
+	this.nowstation = null;
+
+	let stationlist = [];
+	let socktest = null;
+	let passerTrain = new PasserTrain();
+
+		this.modelmanager.loadpromise(Staticmodel, scope.mixers,"2").then(function (data) {
+			// console.log(data);
+			passerTrain.initTrain(scope.modelmanager.train.mesh,mixers,deviceaction,scene);
+			passerTrain.toptrain.position.x = 0;
+			passerTrain.toptrain.position.y = 0;
+			passerTrain.toptrain.position.z = 0;
+			// passerTrain.downtrain.position.z = 40;
+			getPublishMapDetail(skinCode).then(netdata => {
+				scope.switchviews('freeview');
+				passerHuman.initHumans(scope.modelmanager.man1.mesh,scope.modelmanager.man2.mesh);
+				scene.add(humanlist);
+
+				socktest = new TrainConnect(scope,deviceaction,passerTrain.toptrain,routegroup,passerAi);
+
+				store.dispatch('app/animationsClose');
+
+				let checkobject = setInterval(function(){
+
+					clearInterval(checkobject);
+					//进站控制
+					startWorker();
+					passerWebWork.postMessage("on");
+					animate();
+				},1000);
+			});
+
+
+		})
+
+
+
+	this.resetscene = function(){
+
+		// humanlist = new THREE.Group();
+		for(let j=0; j<humanlist.children.length;j++){
+
+			humanlist.remove(humanlist.children[j]);
+			j--;
+			// j--;
+		}
+
+		for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+			passerTrain.toptrain.action.top[an].reset();
+			passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
+			passerTrain.toptrain.action.top[an].timeScale = -1;
+			passerTrain.toptrain.action.top[an].play();
+		}
+
+		setTimeout(function(){
+			passerHuman.setNowTrunkPasser(humanlist);
+			aiswitch = 0;
+		}, 2000);
+
+	}
+
+	function startWorker(){
+		passerHuman.setNowTrunkPasser(humanlist,0,0);
+		let updateaianimate = setInterval(
+			function(){
+				// console.log("?");
+				if(aiswitch == 0){
+					passerHuman.moveAnimateUpdate(humanlist,passerHuman);
+					// passerAi.aiUpdate(humanlist,passerHuman,passerCheckDoor,deviceaction);
+
+					delta = clock.getDelta();
+					// console.log(mixers);
+					for(let i=mixers.length-1;i>=0;i--){
+					 if(mixers[i]._actions[0].isRunning()){
+						 // console.log(mixers[i]);
+						 mixers[i].update( delta );
+					 }
+					}
+					for(let i=humanlist.children.length-1;i>=0;i--){
+					 if(humanlist.children[i].mixer._actions[0].isRunning()){
+						 humanlist.children[i].mixer.update( delta );
+					 }
+					}
+
+				}
+			}
+		, 100);
+
+	}
+
+
+	//循环渲染函数
+	function animate() {
+		passerRender.update();
+
+		if(passerRender.state == "freeview"){
+			controls.update();
+		}
+		// delta = clock.getDelta();
+		requestAnimationFrame(animate);
+
+	}
+
+	window.onresize = function () {
+		passerRender.reSize(scope.dom.offsetWidth,scope.dom.offsetHeight);
+	}
+
+	this.switchcamera = function(trunkNum){
+
+		passerHuman.nowTrunk = trunkNum;
+		passerHuman.resetPasser(humanlist);
+
+
+
+		passerHuman.setNowTrunkPasser(humanlist,scope.nowTrunk.numList[trunkNum].num,trunkNum);
+		switch (trunkNum) {
+			case '0':
+				camerass.position.x = 4.78;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			case '1':
+				camerass.position.x = 26.00;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			case '2':
+				camerass.position.x = 48.71;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			case '3':
+				camerass.position.x = 70.01;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			case '4':
+				camerass.position.x = 92.06;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			case '5':
+				camerass.position.x = 107.30;
+				camerass.position.y = 5.076;
+				camerass.position.z = -0.016;
+				controls.target = new THREE.Vector3(camerass.position.x+0.5,camerass.position.y-0.1,camerass.position.z);
+				controls.update();
+				break;
+			default:
+		}
+	}
+
+	this.getTrainList = function(){
+		return scope.trainList;
+	}
+
+	this.getRunList = function(){
+		return scope.runList;
+	}
+
+	let nowLeaveDoor = null;
+	this.updatePasserMove = function(doorData){
+		nowLeaveDoor = doorData.doorCode;
+		// console.log(doorData);
+	}
+
+
+	this.updateTrainData = function(newData){
+		if(scope.trainList.length > 0){
+			for(let i=0;i<scope.trainList.length;i++){
+				if(newData.code == scope.trainList[i].code){
+					scope.trainList[i].num = scope.trainList[i].num + newData.in - newData.out;
+
+					if(passerTrain.toptrain.nowcode == newData.code){
+						scope.humanWaitIn = getnum(newData.in,6);
+						scope.humanWaitOut = getnum(newData.out,6);
+						// console.log(scope.humanWaitIn);
+						// console.log(scope.humanWaitOut);
+						// 	console.log(nowLeaveDoor);
+						// 	console.log("------------------");
+						passerHuman.initTrainRail(humanlist,scope.humanWaitIn,scope.humanWaitOut,nowLeaveDoor);
+
+						let trainDataList = getnum(scope.trainList[i].num,6);
+						// nowTrunk.code = newCode;
+						scope.nowTrunk.numList = trainDataList;
+						updateTrainNum(trainDataList);
+					}
+				i = scope.trainList.length;
+				}
+			}
+		}
+	}
+
+	this.updateNowTrainCode = function(newCode){
+		passerTrain.toptrain.nowcode = newCode;
+		scope.nowTrainCode = newCode;
+		// console.log(scope.trainList);
+		for(let k in scope.trainList){
+			if(scope.trainList[k].code == newCode){
+				let trainDataList = getnum(scope.trainList[k].num,6);
+				scope.nowTrunk.code = newCode;
+				scope.nowTrunk.numList = trainDataList;
+
+				// console.log(scope.trainList[i]);
+				for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+					passerTrain.toptrain.action.top[an].reset();
+					passerTrain.toptrain.action.top[an].time = 0;
+					passerTrain.toptrain.action.top[an].timeScale = -1;
+					passerTrain.toptrain.action.top[an].play();
+				}
+
+				for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+					passerTrain.toptrain.action.down[an].reset();
+					passerTrain.toptrain.action.down[an].time = 0;
+					passerTrain.toptrain.action.down[an].timeScale = -1;
+					passerTrain.toptrain.action.down[an].play();
+				}
+
+				if(scope.trainList[k].open != "0"){
+					if(scope.trainList[k].doorCode == "1"){
+						for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+							passerTrain.toptrain.action.top[an].reset();
+							passerTrain.toptrain.action.top[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
+							passerTrain.toptrain.action.top[an].timeScale = 1;
+							passerTrain.toptrain.action.top[an].play();
+						}
+					}else{
+						for(let an=passerTrain.toptrain.action.top.length-1;an>=0;an--){
+							passerTrain.toptrain.action.down[an].reset();
+							passerTrain.toptrain.action.down[an].time = passerTrain.toptrain.action.top[an]._clip.duration;
+							passerTrain.toptrain.action.down[an].timeScale = 1;
+							passerTrain.toptrain.action.down[an].play();
+						}
+					}
+				}
+
+				updateTrainNum(trainDataList);
+				break;
+				// i = scope.trainList.length;
+			}
+		}
+
+
+	}
+
+	this.switchviews = function(viewmode){
+		passerRender.changeRenderMode(viewmode);
+	}
+
+	function getnum(num,pnum){
+		let re = [];
+		let base = Math.floor(num/pnum);
+		let reset = num%pnum;
+		for(let i=0;i<pnum;i++){
+			let nownum = base+(i<reset?1:0);
+			let newtraindata = {
+				num:nownum,
+				percent:parseInt(nownum/220*100)+"%",
+			}
+			re.push(newtraindata);
+		}
+		return re;
+	}
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/loader/loader.js b/src/jlmap3d/jl3dtrafficplan/loader/loader.js
new file mode 100644
index 000000000..1fe0a8933
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/loader/loader.js
@@ -0,0 +1,159 @@
+import { BASE_ASSET_API } from '@/api/jlmap3d/assets3d.js';
+import store from '@/store/index_APP_TARGET';
+//模型管理器
+let mode = "0";
+export function ModelManager(){
+  let scope = this;
+
+  this.man1 = {
+    code:null,
+    locateType:"01",
+    mesh:null,
+    action:null
+  };
+  this.man2 = {
+    code:null,
+    locateType:"01",
+    mesh:null,
+    action:null
+  };
+
+
+  this.station = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+
+  this.zhajiin = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+  this.zhajiout = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+
+  this.monitor = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+
+  this.train = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+
+
+  this.section = {
+    code:null,
+    screenDoorOpenStatus:"01",
+    animations:null,
+    mesh:null,
+    action:null
+  };
+
+  //读取模型
+  this.loadpromise = function (data,mixers,loadmode){
+    mode = loadmode;
+    let initlist = [];
+    for(let i=0,leni=data.length;i<leni;i++){
+      if(data[i].type == "man1" || data[i].type == "cctvMan1"){
+        initlist.push(fbxpromise(data[i],mixers,scope.man1));
+      }
+      if(data[i].type == "man2" || data[i].type == "cctvMan2"){
+        initlist.push(fbxpromise(data[i],mixers,scope.man2));
+      }
+      if(data[i].type == "cctvStation"){
+        initlist.push(fbxpromise(data[i],mixers,scope.station));
+      }
+      if(data[i].type == "cctvGateIn"){
+        initlist.push(fbxpromise(data[i],mixers,scope.zhajiin));
+      }
+      if(data[i].type == "cctvGateOut"){
+        initlist.push(fbxpromise(data[i],mixers,scope.zhajiout));
+      }
+      if(data[i].type == "cctvMonitor"){
+        initlist.push(fbxpromise(data[i],mixers,scope.monitor));
+      }
+      if(data[i].type == "cctvTrain"){
+        initlist.push(fbxpromise(data[i],mixers,scope.train));
+      }
+      if(data[i].type == "cctvSection"){
+        initlist.push(fbxpromise(data[i],mixers,scope.section));
+      }
+    }
+    //promise按顺序加载
+    return new Promise(function(resolve, reject){
+
+      Promise.all(initlist).then((result) => {
+        console.log("success");
+        store.dispatch('app/animationsClose');
+        resolve("success");             //['成功了', 'success']
+      }).catch((error) => {
+        //console.log(error);
+      });
+
+    });
+  }
+
+}
+//fbx模型加载
+function fbxpromise(asset,mixers,model){
+  return new Promise(function(resolve, reject){
+    var loader = new THREE.FBXLoader();
+    if(  mode == "2"){
+      loader.load( asset.url, function ( object ) {
+        model.mesh = object;
+
+        resolve(asset.deviceType);
+      } );
+
+    }else{
+      loader.load( BASE_ASSET_API+asset.url, function ( object ) {
+
+        //列车模型子物体重新排序
+        if(asset.type == "cctvTrain"){
+          // let mixer = new THREE.AnimationMixer( object );
+          let realtrain = new THREE.Group();
+          for(let j=6;j>0;j--){
+            let name = "c"+j;
+            for(let i=0;i<object.children.length;i++){
+              if(object.children[i].name == name){
+
+                object.children[i].position.x = object.children[i].position.x;
+                //object.children[i].position.y = j*10;
+                realtrain.add(object.children[i]);
+                i--;
+              }
+            }
+          }
+          model.mesh = realtrain;
+          model.mesh.animations =  object.animations[0].tracks;
+          //
+        }else{
+          model.mesh = object;
+
+        }
+
+        resolve(asset.deviceType);
+      } );
+
+    }
+
+  });
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/loader/stationconfig.js b/src/jlmap3d/jl3dtrafficplan/loader/stationconfig.js
new file mode 100644
index 000000000..cc65a5433
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/loader/stationconfig.js
@@ -0,0 +1,56 @@
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+var Staticmodel = [
+	{
+		id: "1",
+		name: "人物1",
+		deviceType: "man1",
+		type: "man1",
+		url: "/cbtc/static/MODEL/passflow/man1.FBX"
+	},{
+		id: "2",
+		name: "人物2",
+		deviceType: "man2",
+		type: "man2",
+		url: "/cbtc/static/MODEL/passflow/man2.FBX"
+	},{
+		id: "3",
+		name: "车站",
+		deviceType: "cctvStation",
+		type: "cctvStation",
+		url: "/cbtc/static/trafficplan/station.FBX"
+	},{
+		id: "4",
+		name: "闸机",
+		deviceType: "cctvGateIn",
+		type: "cctvGateIn",
+		url: "/cbtc/static/MODEL/passflow/zhajiin.FBX"
+	},{
+		id: "5",
+		name: "闸机",
+		deviceType: "cctvGateOut",
+		type: "cctvGateOut",
+		url: "/cbtc/static/MODEL/passflow/zhajiout.FBX"
+	},{
+		id: "6",
+		name: "摄像机",
+		deviceType: "cctvMonitor",
+		type: "cctvMonitor",
+		url: "/cbtc/static/MODEL/passflow/monitor.FBX"
+	},{
+		id: "7",
+		name: "列车",
+		deviceType: "cctvTrain",
+		type: "cctvTrain",
+		url: "/cbtc/static/trafficplan/train.FBX"
+	},{
+		id: "8",
+		name: "区段",
+		deviceType: "cctvSection",
+		type: "cctvSection",
+		url: "/cbtc/static/MODEL/passflow/section.FBX"
+	}
+
+
+];
+
+export { Staticmodel }
diff --git a/src/jlmap3d/jl3dtrafficplan/loader/trainconfig.js b/src/jlmap3d/jl3dtrafficplan/loader/trainconfig.js
new file mode 100644
index 000000000..67632980e
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/loader/trainconfig.js
@@ -0,0 +1,27 @@
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+var Staticmodel = [
+	{
+		id: "1",
+		name: "人物1",
+		deviceType: "man1",
+		type: "man1",
+		url: "/cbtc/static/trafficplan/man1.FBX"
+	},
+	{
+		id: "2",
+		name: "人物2",
+		deviceType: "man2",
+		type: "man2",
+		url: "/cbtc/static/trafficplan/man2.FBX"
+	},
+	{
+		id: "7",
+		name: "列车",
+		deviceType: "train",
+		type: "cctvTrain",
+		url: "/cbtc/static/trafficplan/train.FBX"
+	},
+];
+
+
+export { Staticmodel }
diff --git a/src/jlmap3d/jl3dtrafficplan/model/passercheckdoor.js b/src/jlmap3d/jl3dtrafficplan/model/passercheckdoor.js
new file mode 100644
index 000000000..9f87578d3
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/passercheckdoor.js
@@ -0,0 +1,230 @@
+export function  PasserCheckDoor(data) {
+	var scope = this;
+	//入口闸机组
+	this.zhajiin = [];
+	//出口闸机组
+	this.zhajiout = [];
+	//定义闸机状态
+	for(let i=0;i<5;i++){
+		let zhaji = {
+			id:"in0"+(i+1),
+			status:0,
+			waiting:0
+		}
+		scope.zhajiin.push(zhaji);
+	}
+	for(let i=0;i<5;i++){
+		let zhaji = {
+			id:"out0"+(i+1),
+			status:0,
+			waiting:0
+		}
+		scope.zhajiout.push(zhaji);
+	}
+	//初始化闸机动画
+	this.initCheckDoorInAnimation = function(object,mixers ,deviceaction ,scene){
+		let mixer = new THREE.AnimationMixer(  object );
+		let newclip = object.animations[ 0 ];
+		let newzhaji = object;
+		for(let i=0;i<newzhaji.children.length;i++){
+			if(newzhaji.children[i].name == "in01"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in02"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in03"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in04"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "in05"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+
+		}
+		scene.add(newzhaji);
+
+	}
+	//初始化闸机动画
+	this.initCheckDoorOutAnimation = function(object,mixers ,deviceaction ,scene){
+		let mixer = new THREE.AnimationMixer(  object );
+		let newclip = object.animations[ 0 ];
+		let newzhaji = object;
+		for(let i=0;i<newzhaji.children.length;i++){
+			if(newzhaji.children[i].name == "out01"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out02"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out03"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out04"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+			if(newzhaji.children[i].name == "out05"){
+				newzhaji.children[i].animations = [];
+				newzhaji.children[i].animations.push(newclip.clone());
+
+				let mixer = new THREE.AnimationMixer(  newzhaji.children[i] );
+
+				let action =mixer.clipAction( newzhaji.children[i].animations[0]);
+				action.setLoop(THREE.LoopOnce);
+				action.clampWhenFinished = true;
+
+				mixers.push(mixer);
+				let device = {
+					action:action,
+					mixer:mixer,
+				};
+				deviceaction[object.children[i].name] = device;
+			}
+
+		}
+		scene.add(newzhaji);
+	}
+	//闸机动画控制
+	this.checkDoorControl = function(type,door,deviceaction){
+		let devicenum = door;
+
+		if(type == "in"){
+			let checkDoorId = scope.zhajiin[devicenum].id;
+			deviceaction[checkDoorId].action.reset();
+			deviceaction[checkDoorId].action.time = 0;
+			deviceaction[checkDoorId].action.timeScale = 1;
+			deviceaction[checkDoorId].action.play();
+		}else if(type == "out"){
+			let checkDoorId = scope.zhajiout[devicenum].id;
+			deviceaction[checkDoorId].action.reset();
+			deviceaction[checkDoorId].action.time = 0;
+			deviceaction[checkDoorId].action.timeScale = 1;
+			deviceaction[checkDoorId].action.play();
+		}
+	}
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
new file mode 100644
index 000000000..9c714af0d
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/passerhuman.js
@@ -0,0 +1,298 @@
+export function  PasserHuman() {
+  let scope = this;
+
+
+
+  //初始人物模型和动画
+  let originhuman1 = null;
+  let originhuman2 = null;
+  let originanima1 = null;
+  let originanima2 = null;
+  //初始化人物模型动画
+  this.initHumans = function(object1,object2,mixers,deviceaction,scene){
+    originhuman1 = object1;
+    originhuman1.progress = 1;
+    // scene.add(originhuman1);
+    originhuman2 =  object2;
+
+    let mixer1 = new THREE.AnimationMixer( originhuman1 );
+    let mixer2 = new THREE.AnimationMixer( originhuman2 );
+    originanima1 = originhuman1.animations[ 0 ];
+    originanima2 = originhuman2.animations[ 0 ];
+    originhuman1.remove(originhuman1.children[2]);
+
+  }
+  //创建新的进站乘客
+  this.newInHuman= function(humanlist,position){
+    if(scope.humanWaitIn.length != 0){
+      let newhuman;
+      createHumanModel(newhuman,humanlist,position,scope.humanWaitIn[0].stage,scope.humanWaitIn[0].direct,scope.humanWaitIn[0].door);
+      scope.humanWaitIn.shift();
+    }
+  }
+  //创建新的出站乘客
+  this.newOutHuman = function(humanlist,position){
+    if(scope.humanWaitOut.length != 0){
+      let newhuman;
+      createHumanModel(newhuman,humanlist,position,scope.humanWaitOut[0].stage,scope.humanWaitOut[0].direct,scope.humanWaitOut[0].door);
+      scope.humanWaitOut.shift();
+    }
+
+ }
+  //创建新的乘客
+  this.newHumanCreate = function(humanlist,position,stage,direct,door,overGoal){
+    let newhuman;
+    createHumanModel(newhuman,humanlist,position,stage,direct,door,overGoal);
+  }
+
+  function createHumanModel(newhuman,humanlist,position,stage,direct,door,overGoal){
+    let mantype = Math.floor(Math.random()*(3-1+1))+1;
+
+    if(mantype == 1){
+      newhuman = THREE.SkeletonUtils.clone( originhuman1 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima1.clone());
+    }else{
+      newhuman = THREE.SkeletonUtils.clone( originhuman2 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima2.clone());
+    }
+
+    let mixer = new THREE.AnimationMixer( newhuman );
+    newhuman.position.copy(position);
+    
+    if(overGoal){
+      newhuman.overGoal = overGoal;
+    }
+
+    if(newhuman.direct == "top"){
+      newhuman.rotation.y = Math.PI;
+    }
+    newhuman.status = 0;
+
+    newhuman.stage = stage;
+    if(direct){
+      if(direct == "top"){
+        newhuman.rotation.y = Math.PI;
+      }
+      newhuman.direct = direct;
+    }else{
+      newhuman.direct = null;
+    }
+
+    newhuman.doorstatus = null;
+    if(door){
+      newhuman.door = door;
+    }else{
+      newhuman.door = null;
+    }
+    newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
+    newhuman.mixer = mixer;
+    newhuman.runrail = null;
+    newhuman.speed = 0;
+    newhuman.mixer = mixer;
+    humanlist.add(newhuman);
+  }
+  //定义新模型走路动画
+  this.initMoveAnimate = function(model,name,points,index){
+    model.status = 1;
+    let curve =  new THREE.CatmullRomCurve3(points);
+    curve.curvrtype = "catmullrom";
+    // curve.getLength();
+    // curve动画轨迹
+    // progress动画进度
+    // enable当前动画开关
+    // speed动画速度
+    // console.log(curve);
+
+    model.action.play();
+    model.progress = 0;
+    model.runrail = curve;
+    model.speed = 0.2/curve.getLength();
+  }
+  //更新人物列表中人物的动画
+  this.moveAnimateUpdate = function(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman){
+    for(let i=0;i<outStationPassers.children.length;i++){
+      if(outStationPassers.children[i].status == 1){
+        if(outStationPassers.children[i].progress>=1){
+          outStationPassers.children[i].progress = 1;
+          outStationPassers.children[i].action.stop();
+          outStationPassers.children[i].status = 0;
+
+					if(outStationPassers.children[i].stage == 8){
+						passerHuman.uncache(outStationPassers.children[i]);
+						outStationPassers.remove(outStationPassers.children[i]);
+						i--;
+					}else if(outStationPassers.children[i].stage == 7){
+						outStationPassers.children[i].stage = 8;
+					}
+					else if(outStationPassers.children[i].stage == 5){
+
+						outStationPassers.children[i].stage = 7;
+
+					}
+        }else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = outStationPassers.children[i].runrail.getPointAt(outStationPassers.children[i].progress);
+
+					//更新模型坐标
+					outStationPassers.children[i].position.x = point.x;
+					outStationPassers.children[i].position.y = point.y;
+					outStationPassers.children[i].position.z = point.z;
+					if((outStationPassers.children[i].progress+0.001)<1){
+						let tangent = outStationPassers.children[i].runrail.getPointAt(outStationPassers.children[i].progress+0.001);
+						outStationPassers.children[i].lookAt(new THREE.Vector3(tangent.x,outStationPassers.children[i].position.y,tangent.z));
+					}
+
+					outStationPassers.children[i].progress += outStationPassers.children[i].speed;
+					point = null;
+
+				}
+      }
+    }
+
+    for(let i=0;i<topWaitPassers.children.length;i++){
+      if(topWaitPassers.children[i].status == 1){
+        if(topWaitPassers.children[i].progress>=1){
+          topWaitPassers.children[i].progress = 1;
+          topWaitPassers.children[i].action.stop();
+          topWaitPassers.children[i].status = 0;
+
+          if(topWaitPassers.children[i].stage == 4){
+            passerHuman.uncache(topWaitPassers.children[i]);
+            topWaitPassers.remove(topWaitPassers.children[i]);
+            i--;
+          }
+        }else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = topWaitPassers.children[i].runrail.getPointAt(topWaitPassers.children[i].progress);
+
+					//更新模型坐标
+					topWaitPassers.children[i].position.x = point.x;
+					topWaitPassers.children[i].position.y = point.y;
+					topWaitPassers.children[i].position.z = point.z;
+					if((topWaitPassers.children[i].progress+0.001)<1){
+						let tangent = topWaitPassers.children[i].runrail.getPointAt(topWaitPassers.children[i].progress+0.001);
+						topWaitPassers.children[i].lookAt(new THREE.Vector3(tangent.x,topWaitPassers.children[i].position.y,tangent.z));
+					}
+
+					topWaitPassers.children[i].progress += topWaitPassers.children[i].speed;
+					point = null;
+
+				}
+      }
+    }
+
+    for(let i=0;i<downWaitPassers.children.length;i++){
+      if(downWaitPassers.children[i].status == 1){
+        if(downWaitPassers.children[i].progress>=1){
+          downWaitPassers.children[i].progress = 1;
+          downWaitPassers.children[i].action.stop();
+          downWaitPassers.children[i].status = 0;
+          if(downWaitPassers.children[i].stage == 4){
+            passerHuman.uncache(downWaitPassers.children[i]);
+            downWaitPassers.remove(downWaitPassers.children[i]);
+            i--;
+          }
+        }else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = downWaitPassers.children[i].runrail.getPointAt(downWaitPassers.children[i].progress);
+
+					//更新模型坐标
+					downWaitPassers.children[i].position.x = point.x;
+					downWaitPassers.children[i].position.y = point.y;
+					downWaitPassers.children[i].position.z = point.z;
+					if((downWaitPassers.children[i].progress+0.001)<1){
+						let tangent = downWaitPassers.children[i].runrail.getPointAt(downWaitPassers.children[i].progress+0.001);
+						downWaitPassers.children[i].lookAt(new THREE.Vector3(tangent.x,downWaitPassers.children[i].position.y,tangent.z));
+					}
+
+					downWaitPassers.children[i].progress += downWaitPassers.children[i].speed;
+					point = null;
+
+				}
+      }
+    }
+
+    for(let i=0;i<humanlist.children.length;i++){
+			if(humanlist.children[i].status == 1){
+				if(humanlist.children[i].progress>=1){
+					//更新模型坐标
+					if(humanlist.children[i].status == 1){
+
+
+						humanlist.children[i].progress = 1;
+						humanlist.children[i].action.stop();
+						humanlist.children[i].status = 0;
+            if(humanlist.children[i].stage == 3){
+
+							humanlist.children[i].stage = 4;
+              if(humanlist.children[i].direct == "top"){
+                topWaitPassers.add(humanlist.children[i]);
+                i--;
+              }else if(humanlist.children[i].direct == "down"){
+                downWaitPassers.add(humanlist.children[i]);
+                i--;
+              }
+
+						}else if(humanlist.children[i].stage == 2){
+							humanlist.children[i].stage = 3;
+
+						}else if(humanlist.children[i].stage == 1){
+
+
+							humanlist.children[i].stage = 2;
+
+						}else if(humanlist.children[i].stage == 0){
+							// // console.log(humans[i].doors);
+							// zhajiin[humanlist.children[i].doors].waiting = 0;
+							humanlist.children[i].stage = 1;
+						}
+
+					}
+
+				}else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress);
+
+					//更新模型坐标
+					humanlist.children[i].position.x = point.x;
+					humanlist.children[i].position.y = point.y;
+					humanlist.children[i].position.z = point.z;
+					if((humanlist.children[i].progress+0.001)<1){
+						let tangent = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress+0.001);
+						humanlist.children[i].lookAt(new THREE.Vector3(tangent.x,humanlist.children[i].position.y,tangent.z));
+					}
+
+					humanlist.children[i].progress += humanlist.children[i].speed;
+					point = null;
+
+				}
+			}
+		}
+  }
+  //离开车站释放缓存
+  this.uncache = function(uncachemodel){
+    if(uncachemodel){
+			uncachemodel.mixer.uncacheAction();
+			uncachemodel.traverse( function ( child ) {
+				if ( child.isMesh ) {
+					child.geometry.dispose();
+					child.material.dispose();
+				}
+			} );
+		}
+  }
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/passerstation.js b/src/jlmap3d/jl3dtrafficplan/model/passerstation.js
new file mode 100644
index 000000000..c02d4134f
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/passerstation.js
@@ -0,0 +1,186 @@
+import {Materialload} from '@/jlmap3d/main/loaders/Materialload.js';
+
+export function  PasserStation() {
+	var scope = this;
+  this.stationMesh = null;
+  this.stationleft = [];
+  this.stationright = [];
+  //替换材质组(站台的)
+  this.stationtexture = [];
+
+  this.stationlist = [];
+
+	this.nowStation = "";
+
+  for(let i=0;i<22;i++){
+  	let sl = {
+  		id:"left"+i,
+  		status:0,
+  		waiting:0
+  	}
+  	scope.stationleft.push(sl);
+  }
+
+  for(let i=0;i<22;i++){
+  	let sr = {
+  		id:"right"+i,
+  		status:0,
+  		waiting:0
+  	}
+  	scope.stationright.push(sr);
+  }
+	//初始化车站模型动画
+  this.initStationAnimation = function( object,mixers ,deviceaction ,scene){
+    let mixer = new THREE.AnimationMixer( object ,mixers ,deviceaction ,scene);
+
+    let newclip = object.animations[ 0 ];
+    for(let j=0;j<object.children.length;j++){
+
+      if(object.children[j].name == "top"){
+        // let geometry = new THREE.BoxBufferGeometry( 50, 50, 50 );
+        // let material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
+        // let cube = new THREE.Mesh( geometry, material );
+        // cube.position.copy(object.children[j].position);
+        // scene.add( cube );
+        object.children[j].animations = [];
+        object.children[j].animations.push(newclip.clone());
+
+        let mixer = new THREE.AnimationMixer(  object.children[j] );
+
+        let action =mixer.clipAction( object.children[j].animations[0])
+        action.setLoop(THREE.LoopOnce);
+        action.clampWhenFinished = true;
+        // action.play();
+
+        mixers.push(mixer);
+        let device = {
+          action:action,
+          mixer:mixer,
+        };
+        deviceaction[object.children[j].name] = device;
+      }
+      if(object.children[j].name == "down"){
+        object.children[j].animations = [];
+        object.children[j].animations.push(newclip.clone());
+
+        let mixer = new THREE.AnimationMixer( object.children[j] );
+
+
+        let action =mixer.clipAction( object.children[j].animations[0])
+        // action.play();
+        action.setLoop(THREE.LoopOnce);
+        action.clampWhenFinished = true;
+
+        mixers.push(mixer);
+        let device = {
+          action:action,
+          mixer:mixer,
+        };
+        deviceaction[object.children[j].name] = device;
+      }
+    }
+    object.traverse( function ( child ) {
+
+      if ( child.isMesh ) {
+        child.renderOrder = 9;
+      }
+
+    } );
+    scope.stationMesh = object;
+    // console.log(deviceaction);
+    scene.add(object);
+
+  }
+	//初始化车站名称数据
+  this.initStationList = function(stationdata,standdata,psddata){
+    let list = [];
+    if(psddata){
+      for(let i=0,leni = standdata.length;i<leni;i++){
+        for(let j=0,lenj = psddata.length;j<lenj;j++){
+          if(standdata[i].code == psddata[j].standCode){
+            standdata[i].name = psddata[j].code;
+          }
+        }
+      }
+      for(let i=0,leni = stationdata.length;i<leni;i++){
+        if(stationdata[i].depot == false){
+          list[stationdata[i].name] = [];
+          for(let j=0,lenj = standdata.length;j<lenj;j++){
+            if(standdata[j].stationCode == stationdata[i].code){
+              list[stationdata[i].name].push(standdata[j]);
+            }
+          }
+        }
+      }
+      for(let k in list){
+        if(list[k].length>0){
+          let stationobject = {
+            code : list[k][0].stationCode,
+            name : k,
+						topspeed:0,
+						downspeed:0,
+						toppassers:0,
+						downpassers:0,
+            toppsd:null,
+            downpsd:null,
+            topsection:null,
+            downsection:null,
+						topstand:null,
+						downstand:null
+          };
+          if(list[k][0].position.y<list[k][1].position.y){
+            stationobject.toppsd = list[k][0].name;
+            stationobject.downpsd = list[k][1].name;
+            stationobject.topsection = list[k][0].standTrackCode;
+            stationobject.downsection = list[k][1].standTrackCode;
+						stationobject.topstand = list[k][0].code;
+						stationobject.downstand = list[k][1].code;
+          }else{
+            stationobject.toppsd = list[k][1].name;
+            stationobject.downpsd = list[k][0].name;
+            stationobject.topsection = list[k][1].standTrackCode;
+            stationobject.downsection = list[k][0].standTrackCode;
+						stationobject.topstand = list[k][1].code;
+						stationobject.downstand = list[k][0].code;
+          }
+          scope.stationlist.push(stationobject);
+        }
+
+      }
+
+      scope.nowStation = scope.stationlist[0];
+      if(scope.stationtexture["stationlist"]){
+        scope.stationMesh.getObjectByName("zhantailiebiao").material.map =scope.stationtexture["stationlist"];
+        scope.stationMesh.getObjectByName("zhantailiebiao").material.map.needsUpdate = true;
+        if(scope.stationMesh.getObjectByName("menkuangyanse")){
+          scope.stationMesh.getObjectByName("menkuangyanse").material.map =scope.stationtexture["pingbimen"];
+          scope.stationMesh.getObjectByName("menkuangyanse").material.map.needsUpdate = true;
+        }
+        scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
+        scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
+      }
+      updatestationlist(scope.stationlist);
+    }else{
+      olddataai = true;
+    }
+  }
+	//加载线路车站名贴图
+	this.loadMaterial = function(netdata3d){
+		Materialload(scope,JSON.parse(netdata3d.data.assets).stationTextureList[0]);
+	}
+	//更换场景车站
+  this.changestation = function(stationname){
+    for(let i=0,leni=scope.stationlist.length;i<leni;i++){
+      if(scope.stationlist[i].name == stationname){
+        scope.nowStation = scope.stationlist[i];
+
+        if(scope.stationtexture["stationlist"]){
+          scope.stationMesh.getObjectByName("zhantaiming").material.map = scope.stationtexture[scope.nowStation.code];
+          scope.stationMesh.getObjectByName("zhantaiming").material.map.needsUpdate = true;
+        }
+        i=leni;
+      }
+    }
+  }
+
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/passertrain.js b/src/jlmap3d/jl3dtrafficplan/model/passertrain.js
new file mode 100644
index 000000000..3c7abca34
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/passertrain.js
@@ -0,0 +1,134 @@
+export function  PasserTrain() {
+  let scope = this;
+  this.toptrain = null;
+  this.downtrain = null;
+
+  this.dataList = [];
+  //初始化列车模型动画
+  this.initTrain = function(object,mixers,deviceaction,scene){
+   let ntracks1,ntracks2,tclip,fclip;
+
+   if(object.animations){
+     tclip = new THREE.AnimationClip("three",2,object.animations[0].tracks);
+
+     // ntracks1 = object.animations.slice(16,27);
+     //
+     // tclip = new THREE.AnimationClip("three",2,ntracks1);
+
+     // ntracks2 = object.animations.slice(0,15);
+
+     // fclip = new THREE.AnimationClip("four",2,ntracks2);
+   }
+
+
+
+
+   object.traverse( function ( child ) {
+
+     if ( child.isMesh ) {
+       child.renderOrder = 8;
+     }
+
+   } );
+
+   let newTrain = object.clone(true);
+   newTrain.nowcode = null;
+   scope.toptrain = newTrain;
+   scope.toptrain.action = {
+     top:[],
+     down:[]
+   };
+   let points1 = [];
+   points1.push(new THREE.Vector3(-71,0.06,-6.3));
+   points1.push(new THREE.Vector3(60.73,0.06,-6.3));
+
+
+   scope.toptrain.curve = new THREE.CatmullRomCurve3(points1);
+
+   scope.downtrain = object.clone(true);
+   scope.downtrain.nowcode = null;
+   scope.downtrain.action = {
+     top:[],
+     down:[]
+   };
+   let points2 = [];
+   points2.push(new THREE.Vector3(-71,0.06,28.68));
+   points2.push(new THREE.Vector3(60.73,0.06,28.68));
+   scope.downtrain.curve = new THREE.CatmullRomCurve3(points2);
+   // console.log(scope.toptrain);
+
+   inittrainanimation(scope.toptrain,tclip,fclip,mixers);
+   inittrainanimation(scope.downtrain,tclip,fclip,mixers);
+
+
+   scope.toptrain.position.z = -20;
+   scope.toptrain.position.y = -20000;
+   scope.toptrain.rotation.y = Math.PI;
+   scope.downtrain.position.z = 40;
+   scope.downtrain.position.y = -20000;
+   scene.add(scope.toptrain);
+   scene.add(scope.downtrain);
+ }
+ //初始化车门动画
+ function inittrainanimation(train,tclip,fclip,mixers){
+
+    for(let j=0;j<train.children.length;j++){
+      // if(train.children[j].name == "c1" || train.children[j].name == "c6"){
+      // console.log(train.children[j].children);
+      for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
+        if(train.children[j].children[n].name == "top"){
+          train.children[j].children[n].animations = [];
+          train.children[j].children[n].animations.push(tclip.clone());
+          let mixer = new THREE.AnimationMixer( train.children[j].children[n] );
+
+          let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+          action.setLoop(THREE.LoopOnce);
+          action.clampWhenFinished = true;
+          train.action.top.push(action);
+          mixers.push(mixer);
+        }
+        if(train.children[j].children[n].name == "down"){
+          train.children[j].children[n].animations = [];
+
+          train.children[j].children[n].animations.push(tclip.clone());
+          let mixer = new THREE.AnimationMixer( train.children[j].children[n] );
+
+          let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+          action.setLoop(THREE.LoopOnce);
+          action.clampWhenFinished = true;
+          train.action.down.push(action);
+          mixers.push(mixer);
+        }
+      }
+
+       // }else{
+       //   for(let n=0,lenn = train.children[j].children.length;n<lenn;n++){
+       //     if(train.children[j].children[n].name == "top"){
+       //       train.children[j].children[n].animations = [];
+       //       train.children[j].children[n].animations.push(fclip.clone());
+       //       let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+       //       mixers.push(mixer);
+       //       let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+       //       action.setLoop(THREE.LoopOnce);
+       //       action.clampWhenFinished = true;
+       //       train.action.top.push(action);
+       //       mixers.push(mixer);
+       //     }
+       //     if(train.children[j].children[n].name == "down"){
+       //       train.children[j].children[n].animations = [];
+       //       train.children[j].children[n].animations.push(fclip.clone());
+       //       let mixer = new THREE.AnimationMixer(  train.children[j].children[n] );
+       //       mixers.push(mixer);
+       //       let action = mixer.clipAction( train.children[j].children[n].animations[ 0 ] );
+       //       action.setLoop(THREE.LoopOnce);
+       //       action.clampWhenFinished = true;
+       //       train.action.down.push(action);
+       //       mixers.push(mixer);
+       //     }
+       //   }
+       // }
+    }
+  }
+
+
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js
new file mode 100644
index 000000000..f3445af7e
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkhuman.js
@@ -0,0 +1,298 @@
+import { PasserTrunkManager } from '@/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkmanager.js';
+export function  PasserHuman() {
+  let scope = this;
+  let trunkManager = new PasserTrunkManager();
+  let waitGroup =  new THREE.Group();
+
+  this.nowTrunk = "";
+
+  this.speed = "0";
+
+  //初始人物模型和动画
+  let originhuman1 = null;
+  let originhuman2 = null;
+  let originanima1 = null;
+  let originanima2 = null;
+  //初始化人物模型动画
+  this.initHumans = function(object1,object2,mixers,deviceaction,scene){
+    originhuman1 = object1;
+    originhuman1.progress = 1;
+    // scene.add(originhuman1);
+    originhuman2 =  object2;
+
+    let mixer1 = new THREE.AnimationMixer( originhuman1 );
+    let mixer2 = new THREE.AnimationMixer( originhuman2 );
+    originanima1 = originhuman1.animations[ 0 ];
+    originanima2 = originhuman2.animations[ 0 ];
+    originhuman1.remove(originhuman1.children[2]);
+
+    for(let i=0;i<220;i++){
+      let newhuman;
+      createHumanModel(newhuman,waitGroup,mixers,new THREE.Vector3(0,0,0));
+    }
+    // console.log(waitGroup);
+  }
+  //创建新的进站乘客
+ //  this.newInHuman= function(humanlist,position){
+ //    if(scope.humanWaitIn.length != 0){
+ //      let newhuman;
+ //      createHumanModel(newhuman,humanlist,position,scope.humanWaitIn[0].stage,scope.humanWaitIn[0].direct,scope.humanWaitIn[0].door);
+ //      scope.humanWaitIn.shift();
+ //    }
+ //  }
+ //  //创建新的出站乘客
+ //  this.newOutHuman = function(humanlist,position){
+ //    if(scope.humanWaitOut.length != 0){
+ //      let newhuman;
+ //      createHumanModel(newhuman,humanlist,position,scope.humanWaitOut[0].stage,scope.humanWaitOut[0].direct,scope.humanWaitOut[0].door);
+ //      scope.humanWaitOut.shift();
+ //    }
+ //
+ // }
+  //创建新的乘客
+  // this.newHumanCreate = function(humanlist,position,stage,direct,door){
+  //   let newhuman;
+  //   createHumanModel(newhuman,humanlist,position,stage,direct,door);
+  // }
+
+  function createHumanModel(newhuman,humanlist,mixers,position,stage,direct,door){
+    let mantype = Math.floor(Math.random()*(3-1+1))+1;
+
+    if(mantype == 1){
+      newhuman = THREE.SkeletonUtils.clone( originhuman1 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima1.clone());
+    }else{
+      newhuman = THREE.SkeletonUtils.clone( originhuman2 );
+      newhuman.animations = [];
+      newhuman.animations.push(originanima2.clone());
+    }
+
+    let mixer = new THREE.AnimationMixer( newhuman );
+    newhuman.position.copy(position);
+
+    newhuman.status = 0;
+
+    newhuman.stage = stage;
+    if(direct){
+      if(direct == "top"){
+        newhuman.rotation.y = Math.PI;
+      }
+      newhuman.direct = direct;
+    }else{
+      newhuman.direct = null;
+    }
+
+    newhuman.doorstatus = null;
+    if(door){
+      newhuman.door = door;
+    }else{
+      newhuman.door = null;
+    }
+    newhuman.progress = 1;
+    newhuman.action = mixer.clipAction( newhuman.animations[ 0 ] );
+    newhuman.mixer = mixer;
+    newhuman.runrail = null;
+    newhuman.speed = 0;
+    newhuman.mixer = mixer;
+    humanlist.add(newhuman);
+  }
+  //定义新模型走路动画
+  this.initMoveAnimate = function(model,name,points,index){
+    model.status = 1;
+    let curve =  new THREE.CatmullRomCurve3(points);
+    curve.curvrtype = "catmullrom";
+    // curve.getLength();
+    // curve动画轨迹
+    // progress动画进度
+    // enable当前动画开关
+    // speed动画速度
+    // console.log(curve);
+
+    model.action.play();
+    model.progress = 0;
+    model.runrail = curve;
+    model.speed = 0.2/curve.getLength();
+  }
+  //更新人物列表中人物的动画
+  this.moveAnimateUpdate = function(humanlist,passerHuman){
+    for(let i=0;i<humanlist.children.length;i++){
+				if(humanlist.children[i].progress>=1){
+					//更新模型坐标
+          humanlist.children[i].progress = 1;
+          humanlist.children[i].action.stop();
+					if(humanlist.children[i].status == 1){
+
+
+
+            waitGroup.add(humanlist.children[i]);
+					}
+
+				}else{
+		//根据动画进度获取动画轨迹上点
+					// console.log(i);
+					// console.log(humanlist.children[i].runrail);
+					// console.log(humanlist.children[i].progress);
+					let point = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress);
+
+					//更新模型坐标
+					humanlist.children[i].position.x = point.x;
+					humanlist.children[i].position.y = point.y;
+					humanlist.children[i].position.z = point.z;
+					if((humanlist.children[i].progress+0.001)<1){
+						let tangent = humanlist.children[i].runrail.getPointAt(humanlist.children[i].progress+0.001);
+						humanlist.children[i].lookAt(new THREE.Vector3(tangent.x,humanlist.children[i].position.y,tangent.z));
+					}
+
+					humanlist.children[i].progress += humanlist.children[i].speed;
+					point = null;
+
+				}
+		}
+  }
+
+  this.resetPasser = function(humanlist){
+    let passerlength = humanlist.children.length;
+    for(let i=0;i<passerlength;i++){
+      waitGroup.add(humanlist.children[0]);
+    }
+  }
+
+  this.initTrainRail = function(humanlist,inNum,leaveNum,direct){
+    // console.log(inNum[scope.nowTrunk]);
+    let inPasser = getnum(inNum[scope.nowTrunk].num,3);
+    let outPasser = getnum(leaveNum[scope.nowTrunk].num,3);
+    // console.log(inPasser);
+    // console.log(outPasser);
+    // let outPassers = inNum[scope.nowTrunk].num;
+
+    for(let i=0;i<inPasser.length;i++){
+      for(let j=0;j<inPasser[i];j++){
+        setTimeout(function(){
+          scope.createInPasser(humanlist,direct);
+        }, Math.random()*1000*i);
+
+      }
+    }
+
+    let created = 0;
+    for(let i=0;i<outPasser.length;i++){
+      for(let j=0;j<outPasser[i];j++){
+        // setTimeout(function(){
+          scope.createOutPasser(humanlist,created,direct);
+        // }, Math.random()*1000*i);
+        created++;
+      }
+
+    }
+  }
+
+  this.createInPasser = function(humanlist,direct){
+    waitGroup.children[0].progress = 0;
+    waitGroup.children[0].status = 0;
+    waitGroup.children[0].action.play();
+
+    let points = [];
+    let point1 = trunkManager.getDoorRandomPos(scope.nowTrunk,direct);
+    let overpoint = trunkManager.getTrunkRandomPos(scope.nowTrunk);
+    waitGroup.children[0].position.copy(point1);
+    points.push(point1);
+    if(direct == 1){
+      points.push(new THREE.Vector3(point1.x,point1.y,point1.z+0.5));
+    }else{
+      points.push(new THREE.Vector3(point1.x,point1.y,point1.z-0.5));
+    }
+
+    points.push(overpoint);
+
+
+    let curve = new THREE.CatmullRomCurve3(points);
+    waitGroup.children[0].runrail = curve;
+    waitGroup.children[0].speed = 0.2/curve.getLength();
+
+    humanlist.add(waitGroup.children[0]);
+  }
+
+  this.createOutPasser = function(humanlist,created,direct){
+
+    humanlist.children[created].progress = 0;
+    humanlist.children[created].status = 1;
+    humanlist.children[created].action.play();
+
+    let points = [];
+    let point1 = new THREE.Vector3(humanlist.children[created].position.x,humanlist.children[created].position.y,humanlist.children[created].position.z);
+
+    let overpoint = trunkManager.getDoorRandomPos(scope.nowTrunk,direct);
+    points.push(point1);
+    if(direct == 1){
+      points.push(new THREE.Vector3(point1.x,point1.y,point1.z+0.5));
+    }else{
+      points.push(new THREE.Vector3(point1.x,point1.y,point1.z-0.5));
+    }
+
+    points.push(overpoint);
+
+
+    let curve = new THREE.CatmullRomCurve3(points);
+    humanlist.children[created].runrail = curve;
+    humanlist.children[created].speed = 0.2/curve.getLength();
+  }
+
+
+  this.setNowTrunkPasser = function(humanlist,num,trunknum){
+    // let array = getnum(num,6);
+    // console.log(array);
+    if(num){
+      // for(let i=0;i<array.length;i++){
+      for(let j=0;j<num;j++){
+        let pos = trunkManager.getTrunkRandomPos(trunknum);
+        waitGroup.children[0].zone = trunkManager.trunk[trunknum].name;
+        waitGroup.children[0].position.x = pos.x;
+        waitGroup.children[0].position.y = pos.y;
+        waitGroup.children[0].position.z = pos.z;
+
+        if(pos.z<0){
+          waitGroup.children[0].rotation.y = Math.PI;
+        }else{
+          waitGroup.children[0].rotation.y = 0;
+        }
+        humanlist.add(waitGroup.children[0]);
+      }
+      // }
+    }
+
+  }
+
+  //计算距离
+  //let dx = Math.abs(point1.x - point2.x);
+  //let dy = Math.abs(point1.y - point2.y);
+  //let distance = Math.sqrt(Math.pow(dx,2)+Math.pow(dy,2));
+  //寻找最小距离
+  // var x = 9 ,y = 12 , c = 50;
+	// var max = x > y ? (x > c ? x : c)  : (y > c ? y : c);
+	// var min = x < y ? (x < c ? x : c)  : (y < c ? y : c);
+
+  function getnum(num,pnum){
+		let re = [];
+		let base = Math.floor(num/pnum);
+		let reset = num%pnum;
+		for(let i=0;i<pnum;i++){
+			let nownum = base+(i<reset?1:0);
+
+			re.push(nownum);
+		}
+		return re;
+	}
+  //离开车站释放缓存
+  this.uncache = function(uncachemodel){
+    if(uncachemodel){
+			uncachemodel.mixer.uncacheAction();
+			uncachemodel.traverse( function ( child ) {
+				if ( child.isMesh ) {
+					child.geometry.dispose();
+					child.material.dispose();
+				}
+			} );
+		}
+  }
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkmanager.js b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkmanager.js
new file mode 100644
index 000000000..2fb8c1780
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/traintrunk/passertrunkmanager.js
@@ -0,0 +1,126 @@
+export function  PasserTrunkManager(data) {
+	var scope = this;
+
+  this.trunk = [
+    {
+      name:"trunk1",
+      position:new THREE.Vector3(11.6,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(7.12,1.22,-1.6),
+        new THREE.Vector3(11.6,1.22,-1.6),
+        new THREE.Vector3(16,1.22,-1.6)
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(7.12,1.22,1.6),
+        new THREE.Vector3(11.6,1.22,1.6),
+        new THREE.Vector3(16,1.22,1.6)
+      ],
+    },
+    {
+      name:"trunk2",
+      position:new THREE.Vector3(33,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(28.4,1.22,-1.6),
+        new THREE.Vector3(33,1.22,-1.6),
+        new THREE.Vector3(37,1.22,-1.6),
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(28.4,1.22,1.6),
+        new THREE.Vector3(33,1.22,1.6),
+        new THREE.Vector3(37,1.22,1.6),
+      ],
+    },
+    {
+      name:"trunk3",
+      position:new THREE.Vector3(54,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(50,1.22,-1.6),
+        new THREE.Vector3(54,1.22,-1.6),
+        new THREE.Vector3(58,1.22,-1.6),
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(50,1.22,1.6),
+        new THREE.Vector3(54,1.22,1.6),
+        new THREE.Vector3(58,1.22,1.6)
+      ],
+    },
+    {
+      name:"trunk4",
+      position:new THREE.Vector3(75.7,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(71,1.22,-1.6),
+        new THREE.Vector3(75,1.22,-1.6),
+        new THREE.Vector3(79,1.22,-1.6)
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(71,1.22,1.6),
+        new THREE.Vector3(75,1.22,1.6),
+        new THREE.Vector3(79,1.22,1.6)
+      ],
+    },
+    {
+      name:"trunk5",
+      position:new THREE.Vector3(97.1,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(93,1.22,-1.6),
+        new THREE.Vector3(97,1.22,-1.6),
+        new THREE.Vector3(101,1.22,-1.6),
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(93,1.22,1.6),
+        new THREE.Vector3(97,1.22,1.6),
+        new THREE.Vector3(101,1.22,1.6)
+      ],
+    },
+    {
+      name:"trunk6",
+      position:new THREE.Vector3(118.5,1.22,0),
+      leftdoor:[
+        new THREE.Vector3(114.5,1.22,-1.6),
+        new THREE.Vector3(118.5,1.22,-1.6),
+        new THREE.Vector3(122.5,1.22,-1.6),
+      ],
+
+      rightdoor:[
+        new THREE.Vector3(114.5,1.22,1.6),
+        new THREE.Vector3(118.5,1.22,1.6),
+        new THREE.Vector3(122.5,1.22,1.6),
+      ],
+    }
+
+  ];
+	var rand = (min,max) => Math.round(Math.random()*(max-min))+min;
+
+	this.getDoorRandomPos = function(trunkNum,direct){
+		let newPos = null;
+		let doorNum = rand(0,2);
+
+		if(direct == "1"){
+			newPos = scope.trunk[trunkNum].leftdoor[doorNum];
+		}else if(direct == "2"){
+			newPos = scope.trunk[trunkNum].rightdoor[doorNum];
+		}
+    return newPos;
+	}
+
+  this.getTrunkRandomPos = function(index){
+    let newPos = new THREE.Vector3(
+      scope.trunk[index].position.x+RandomNum(-11,11),
+      1.22,
+      scope.trunk[index].position.z+RandomNum(-1.28,1.28));
+
+    return newPos;
+  }
+
+  function RandomNum(Min, Max) {
+    var Range = Max - Min;
+    var Rand = Math.random();
+    var num = Min + Rand * Range; //四舍五入
+    return num;
+  }
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/zonemanager.js b/src/jlmap3d/jl3dtrafficplan/model/zonemanager.js
new file mode 100644
index 000000000..912057e35
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/zonemanager.js
@@ -0,0 +1,331 @@
+import { ZoneModel } from '@/jlmap3d/jl3dpassflow/model/zonemodel.js';
+//进站区域1
+let enter1 = {
+  code : '001',
+  name : "enter1",
+  type : "normal",
+  stage : "0",
+  randompoint : new THREE.Vector3(26.6,9.8,-2.7),
+  railpoints : [
+    new THREE.Vector3(34,9.8,-6),
+    new THREE.Vector3(32,9.8,-6)
+  ]
+};
+//进站区域2
+let enter2 = {
+  code : '002',
+  name : "enter2",
+  type : "normal",
+  stage : "0",
+  randompoint : new THREE.Vector3(27,9.8,16),
+  railpoints : [
+    new THREE.Vector3(34,9.8,31.5),
+    new THREE.Vector3(32,9.8,31.5)
+  ]
+};
+//安检区域
+let security = {
+  code : '003',
+  name : "security",
+  type : "device",
+  stage : "1",
+  randompoint : new THREE.Vector3(8.8,9.8,18),
+  railpoints : [
+    new THREE.Vector3(20.5,9.8,18),
+    new THREE.Vector3(21,9.8,21)
+  ]
+};
+//进方向闸机区域
+let entergate = {
+  code : '004',
+  name : "entergate",
+  type : "device",
+  stage : "2",
+  randompoint : new THREE.Vector3(2.3,9.8,13),
+  railpoints : [
+    new THREE.Vector3(6.3,9.8,18.1),
+    new THREE.Vector3(4.8,9.8,18.1),
+    new THREE.Vector3(3.4,9.8,18.1),
+    new THREE.Vector3(2.1,9.8,18.1),
+    new THREE.Vector3(0.7,9.8,18.1)
+  ]
+};
+//站台上车区域
+let standtop = {
+  code : '005',
+  name : "standtop",
+  type : "stand",
+  stage : "3",
+  randompoint : new THREE.Vector3(-64,1.77,0.38),
+  doorpoints:[
+    new THREE.Vector3(-62.1,1.77,-4.38),
+    new THREE.Vector3(-57.54,1.77,-4.38),
+    new THREE.Vector3(-53.1,1.77,-4.38),
+    new THREE.Vector3(-42.5,1.77,-4.38),
+    new THREE.Vector3(-37.6,1.77,-4.38),
+    new THREE.Vector3(-33.6,1.77,-4.38),
+    new THREE.Vector3(-20.8,1.77,-4.38),
+    new THREE.Vector3(-16.6,1.77,-4.38),
+    new THREE.Vector3(-12,1.77,-4.38),
+    new THREE.Vector3(0.5,1.77,-4.38),
+    new THREE.Vector3(4.8,1.77,-4.38),
+    new THREE.Vector3(9.27,1.77,-4.38),
+    new THREE.Vector3(21.6,1.77,-4.38),
+    new THREE.Vector3(26.2,1.77,-4.38),
+    new THREE.Vector3(30.48,1.77,-4.38),
+    new THREE.Vector3(43.2,1.77,-4.38),
+    new THREE.Vector3(47.5,1.77,-4.38),
+    new THREE.Vector3(51.9,1.77,-4.38)
+  ],
+  // new THREE.Vector3(-62.84,1.77,-4.38),
+  // new THREE.Vector3(-58.11,1.77,-4.38),
+  // new THREE.Vector3(-53.47,1.77,-4.38),
+  // new THREE.Vector3(-45.45,1.77,-4.38),
+  // new THREE.Vector3(-41.1,1.77,-4.38),
+  // new THREE.Vector3(-36.33,1.77,-4.38),
+  // new THREE.Vector3(-31.5,1.77,-4.38),
+  // new THREE.Vector3(-23.65,1.77,-4.38),
+  // new THREE.Vector3(-18.98,1.77,-4.38),
+  // new THREE.Vector3(-14.46,1.77,-4.38),
+  // new THREE.Vector3(-10,1.77,-4.38),
+  // new THREE.Vector3(-2.2,1.77,-4.38),
+  // new THREE.Vector3(2.49,1.77,-4.38),
+  // new THREE.Vector3(7.17,1.77,-4.38),
+  // new THREE.Vector3(11.8,1.77,-4.38),
+  // new THREE.Vector3(19.41,1.77,-4.38),
+  // new THREE.Vector3(24.09,1.77,-4.38),
+  // new THREE.Vector3(28.72,1.77,-4.38),
+  // new THREE.Vector3(33.46,1.77,-4.38),
+  // new THREE.Vector3(41.24,1.77,-4.38),
+  // new THREE.Vector3(45.82,1.77,-4.38),
+  // new THREE.Vector3(50.69,1.77,-4.38)
+  railpoints : [
+    new THREE.Vector3(53.1,1.77,-1.8),
+    new THREE.Vector3(-63.5,1.77,-1.8)
+  ]
+};
+//站台下车区域
+let standdown = {
+  code : '006',
+  name : "standdown",
+  type : "stand",
+  stage : "3",
+  randompoint : new THREE.Vector3(-64,1.77,21),
+  doorpoints:[
+    new THREE.Vector3(-62.1,1.77,27),
+    new THREE.Vector3(-57.54,1.77,27),
+    new THREE.Vector3(-53.1,1.77,27),
+    new THREE.Vector3(-42.5,1.77,27),
+    new THREE.Vector3(-37.6,1.77,27),
+    new THREE.Vector3(-33.6,1.77,27),
+    new THREE.Vector3(-20.8,1.77,27),
+    new THREE.Vector3(-16.6,1.77,27),
+    new THREE.Vector3(-12,1.77,27),
+    new THREE.Vector3(0.5,1.77,27),
+    new THREE.Vector3(4.8,1.77,27),
+    new THREE.Vector3(9.27,1.77,27),
+    new THREE.Vector3(21.6,1.77,27),
+    new THREE.Vector3(26.2,1.77,27),
+    new THREE.Vector3(30.48,1.77,27),
+    new THREE.Vector3(43.2,1.77,27),
+    new THREE.Vector3(47.5,1.77,27),
+    new THREE.Vector3(51.9,1.77,27)
+  ],
+  // new THREE.Vector3(-62.84,1.77,27),
+  // new THREE.Vector3(-58.11,1.77,27),
+  // new THREE.Vector3(-53.47,1.77,27),
+  // new THREE.Vector3(-45.45,1.77,27),
+  // new THREE.Vector3(-41.1,1.77,27),
+  // new THREE.Vector3(-36.33,1.77,27),
+  // new THREE.Vector3(-31.5,1.77,27),
+  // new THREE.Vector3(-23.65,1.77,27),
+  // new THREE.Vector3(-18.98,1.77,27),
+  // new THREE.Vector3(-14.46,1.77,27),
+  // new THREE.Vector3(-10,1.77,27),
+  // new THREE.Vector3(-2.2,1.77,27),
+  // new THREE.Vector3(2.49,1.77,27),
+  // new THREE.Vector3(7.17,1.77,27),
+  // new THREE.Vector3(11.8,1.77,27),
+  // new THREE.Vector3(19.41,1.77,27),
+  // new THREE.Vector3(24.09,1.77,27),
+  // new THREE.Vector3(28.72,1.77,27),
+  // new THREE.Vector3(33.46,1.77,27),
+  // new THREE.Vector3(41.24,1.77,27),
+  // new THREE.Vector3(45.82,1.77,27),
+  // new THREE.Vector3(50.69,1.77,27)
+  railpoints : [
+    new THREE.Vector3(53.1,1.77,24),
+    new THREE.Vector3(-64,1.77,24)
+  ]
+};
+//4是刚下车状态
+//出方向闸机区域
+let exitgate = {
+  code : '007',
+  name : "exitgate",
+  type : "device",
+  stage : "5",
+  randompoint : new THREE.Vector3(-16,9.8,-0.4),
+  railpoints : [
+    new THREE.Vector3(18,9.8,-0.27),
+    new THREE.Vector3(18,9.8,1.18),
+    new THREE.Vector3(18,9.8,2.64),
+    new THREE.Vector3(18,9.8,4.1),
+    new THREE.Vector3(18,9.8,5.4)
+  ]
+};
+//出站台区域1
+let exit1 = {
+  code : '008',
+  name : "exit1",
+  type : "normal",
+  stage : "6",
+  randompoint : new THREE.Vector3(),
+  railpoints : [
+    new THREE.Vector3(28.2,9.8,-7),
+    new THREE.Vector3(30.5,9.8,-7.4)
+  ]
+};
+//出站台区域2
+let exit2 = {
+  code : '009',
+  name : "exit2",
+  type : "normal",
+  stage : "6",
+  randompoint : new THREE.Vector3(),
+  railpoints : [
+    new THREE.Vector3(28.3,9.8,28),
+    new THREE.Vector3(30.2,9.8,28)
+  ]
+};
+let enternum = 0;
+let exitnum = 0;
+//区域管理器
+export function ZoneManager() {
+
+	var scope = this;
+
+  this.name = "test";
+
+  this.list = [];
+
+  initzone();
+  //初始化区域对象
+  function initzone(){
+    scope.list[enter1.name] = new ZoneModel(enter1);
+    scope.list[enter2.name] = new ZoneModel(enter2);
+    scope.list[security.name] = new ZoneModel(security);
+    scope.list[entergate.name] = new ZoneModel(entergate);
+    scope.list[standtop.name] = new ZoneModel(standtop);
+    scope.list[standdown.name] = new ZoneModel(standdown);
+    scope.list[exitgate.name] = new ZoneModel(exitgate);
+    scope.list[exit1.name] = new ZoneModel(exit1);
+    scope.list[exit2.name] = new ZoneModel(exit2);
+  }
+  //获取区域范围内点
+  this.getinitposition = function(name){
+    // console.log(scope.list[name]);
+    let randompoint = new THREE.Vector3(0,scope.list[name].randompoint.y,0);
+
+    // console.log(randompoint);
+    if(name == "enter1"){
+      randompoint.x = scope.list[name].randompoint.x + Math.random()*8;
+      randompoint.z = scope.list[name].randompoint.z +  Math.random()*8;
+    }
+    if(name == "enter2"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*8;
+      randompoint.z = scope.list[name].randompoint.z +  Math.random()*8;
+    }
+    if(name == "security"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*10;
+      randompoint.z = scope.list[name].randompoint.z +  Math.random()*2;
+    }
+    if(name == "entergate"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*5;
+      randompoint.z = scope.list[name].randompoint.z -  Math.random()*2;
+    }
+    if(name == "standtop"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*100;
+      randompoint.z = scope.list[name].randompoint.z +  Math.random();
+    }
+    if(name == "standdown"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*100;
+      randompoint.z = scope.list[name].randompoint.z ;
+    }
+    if(name == "exitgate"){
+      randompoint.x = scope.list[name].randompoint.x +  Math.random()*30;
+      randompoint.z = scope.list[name].randompoint.z +  Math.random()*5;
+    }
+    // let random = Math.random();
+    return randompoint;
+  }
+
+  this.getstandposition = function(name){
+    let n = Math.round(Math.random()*17);
+    if(n>=1){
+      n=n;
+    }else{
+      n=0;
+    }
+    let randompoint = new THREE.Vector3(0,scope.list[name].doorpoints[n].y,0);
+
+    if(name == "standtop"){
+      randompoint.x = scope.list[name].doorpoints[n].x +  Math.random()*3;
+      randompoint.z = scope.list[name].doorpoints[n].z +4+Math.random()*5;
+    }
+    if(name == "standdown"){
+      randompoint.x = scope.list[name].doorpoints[n].x +  Math.random()*3;
+      randompoint.z = scope.list[name].doorpoints[n].z -4-Math.random()*5;
+    }
+    let standdata = {
+      door:n,
+      point:randompoint
+    };
+    return standdata;
+  }
+
+  this.getgateposition = function(name){
+    let randompoint = new THREE.Vector3(0,0,0);
+
+    let standdata = {
+      door:null,
+      point:null
+    };
+    if(name == "entergate"){
+      randompoint.x = scope.list[name].railpoints[enternum].x ;
+      randompoint.y = scope.list[name].railpoints[enternum].y ;
+      randompoint.z = scope.list[name].railpoints[enternum].z ;
+      standdata.door = 4-enternum;
+      enternum += 1;
+      if(enternum>4){
+        enternum = 0;
+      }
+    }
+
+    if(name == "exitgate"){
+
+      randompoint.x = scope.list[name].railpoints[exitnum].x ;
+      randompoint.y = scope.list[name].railpoints[exitnum].y ;
+      randompoint.z = scope.list[name].railpoints[exitnum].z ;
+      standdata.door = 4-exitnum;
+      exitnum += 1;
+      if(exitnum>4){
+        exitnum = 0;
+      }
+    }
+    standdata.point = randompoint;
+
+    return standdata;
+  }
+
+  this.getzoneposition = function(name){
+    // let random = Math.random();
+    let position = scope.list[name].railline.getPointAt(Math.random());
+    return position;
+  }
+
+  this.zoneActionCheck = function(){
+
+  }
+
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/model/zonemodel.js b/src/jlmap3d/jl3dtrafficplan/model/zonemodel.js
new file mode 100644
index 000000000..d31f8883f
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/model/zonemodel.js
@@ -0,0 +1,20 @@
+export function  ZoneModel(data) {
+	var scope = this;
+  //code
+  this.code = data.code;
+	//命名
+	this.name = data.name;
+  this.type = data.type;
+	this.stage = data.stage;
+  this.status = 0;
+	this.randompoint = data.randompoint;
+	//轨迹点
+	this.railpoints = data.railpoints;
+
+	this.railline = new THREE.CatmullRomCurve3(data.railpoints);
+	if(data.doorpoints){
+		this.doorpoints = data.doorpoints;
+	}else{
+		this.doorpoints = null;
+	}
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js b/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js
new file mode 100644
index 000000000..8b5709dd7
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/passerai/passerai.js
@@ -0,0 +1,267 @@
+
+
+export function  PasserAi(zone,finder) {
+  let scope = this;
+
+  //下车控制开关
+	this.toppasseron = false;
+	this.downpasseron = false;
+  //上车控制开关
+  this.toppasserin = false;
+  this.downpasserin = false;
+  let passerZone = zone;
+  let pathFinder = finder;
+
+	let path;
+	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
+	let targetPosition = new THREE.Vector3();
+  //生成下车出站人物
+  this.passerout = function(direct,mode){
+    // console.log(direct);
+    if(direct == "top"){
+      // console.log("toppasser");
+      if(mode == "start"){
+        scope.toppasseron = true;
+        scope.toppasserin = true;
+      }
+      if(mode == "end"){
+        scope.toppasseron = false
+        scope.toppasserin = false;
+      }
+      // scope.toppasseron = true;
+      // setTimeout(function(){
+      //   scope.toppasseron = false
+      //   scope.toppasserin = true;
+      //
+      //   setTimeout(function(){
+      //     scope.toppasserin = false;
+      //   }, 20000);
+      // }, 5000);
+    }
+    if(direct == "down"){
+      if(mode == "start"){
+        scope.downpasseron = true;
+        scope.downpasserin = true;
+      }
+      if(mode == "end"){
+        scope.downpasseron = false;
+        scope.downpasserin = false;
+      }
+      // console.log("downpasser");
+      // scope.downpasseron = true;
+      // setTimeout(function(){
+      //   scope.downpasseron = false;
+      //   scope.downpasserin = true;
+      //   setTimeout(function(){
+      //     scope.downpasserin = false;
+      //   }, 20000);
+      // }, 5000);
+    }
+  }
+
+  //初始化加载人物
+  this.initPasser = function(humanlist,topWaitPassers,downWaitPassers,passerHuman,jl3d){
+
+
+		for(let i=0;i<jl3d.humanWaitTop;i++){
+			let standdata = passerZone.getstandposition("standtop");
+			passerHuman.newHumanCreate(topWaitPassers,standdata.point,4,"top",standdata.door);
+		}
+		for(let i=0;i<jl3d.humanWaitDown;i++){
+			let standdata = passerZone.getstandposition("standdown");
+			passerHuman.newHumanCreate(downWaitPassers,standdata.point,4,"down",standdata.door);
+		}
+  }
+
+  //人物站台阶段更新
+  this.aiUpdate = function(humanlist,topWaitPassers,downWaitPassers,outStationPassers,passerHuman,passerCheckDoor,deviceaction){
+
+    for(let i=0;i<outStationPassers.children.length;i++){
+      if(outStationPassers.children[i].status == 0){
+        //stage = 5 下车
+        if(outStationPassers.children[i].stage == 5){
+          let points = [];
+          points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
+          if(outStationPassers.children[i].direct == "top"){
+            points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z+5));
+          }
+          if(outStationPassers.children[i].direct == "down"){
+            points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z-5));
+          }
+          targetPosition = passerZone.getgateposition("exitgate");
+          path = pathFinder.find(points[1],targetPosition.point);
+          outStationPassers.children[i].door = targetPosition.door;
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
+        }
+
+        //stage = 7 出闸机
+        if(outStationPassers.children[i].stage == 7){
+            let points = [];
+            points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
+            points.push(new THREE.Vector3(outStationPassers.children[i].position.x+5,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
+
+            passerCheckDoor.checkDoorControl("out",outStationPassers.children[i].door,deviceaction)
+            passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
+        }
+
+        //stage = 8 出站
+        if(outStationPassers.children[i].stage == 8){
+          let direct = Math.floor(Math.random()*(3-1+1))+1;
+          let points = [];
+          points.push(new THREE.Vector3(outStationPassers.children[i].position.x,outStationPassers.children[i].position.y,outStationPassers.children[i].position.z));
+
+          //1--top
+          //2-- down
+          if(direct == 1){
+            targetPosition = passerZone.getzoneposition("exit1");
+            path = pathFinder.find(points[0],targetPosition);
+          }else{
+            targetPosition = passerZone.getzoneposition("exit2");
+            path = pathFinder.find(points[0],targetPosition);
+          }
+
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(outStationPassers.children[i],i,points,i);
+
+        }
+      }
+    }
+
+    for(let i=0;i<topWaitPassers.children.length;i++){
+      if(topWaitPassers.children[i].status == 0){
+        //stage = 4 上车
+        if(topWaitPassers.children[i].stage == 4){
+          if(scope.toppasserin && topWaitPassers.children[i].direct == "top"){
+
+
+            let points = [];
+            points.push(new THREE.Vector3(topWaitPassers.children[i].position.x,topWaitPassers.children[i].position.y,topWaitPassers.children[i].position.z));
+
+            points.push(passerZone.list["standtop"].doorpoints[topWaitPassers.children[i].door]);
+
+            if(points[1] == undefined){
+
+            }else{
+              passerHuman.initMoveAnimate(topWaitPassers.children[i],i,points,i);
+            }
+          }
+        }
+      }
+    }
+
+    for(let i=0;i<downWaitPassers.children.length;i++){
+      if(downWaitPassers.children[i].status == 0){
+        //stage = 4 上车
+        if(downWaitPassers.children[i].stage == 4){
+
+          if(scope.downpasserin && downWaitPassers.children[i].direct == "down"){
+            let points = [];
+            points.push(new THREE.Vector3(downWaitPassers.children[i].position.x,downWaitPassers.children[i].position.y,downWaitPassers.children[i].position.z));
+
+            points.push(passerZone.list["standdown"].doorpoints[downWaitPassers.children[i].door]);
+
+            if(points[1] == undefined){
+
+            }else{
+              passerHuman.initMoveAnimate(downWaitPassers.children[i],i,points,i);
+            }
+          }
+        }
+      }
+    }
+
+    for(let i=0;i<humanlist.children.length;i++){
+      // console.log(humans[i]);
+
+      if(humanlist.children[i].status == 0){
+        //stage = 0 进入车站
+        if(humanlist.children[i].stage == 0){
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+          targetPosition = passerZone.getzoneposition("security");
+
+          path = pathFinder.find(points[0],targetPosition);
+
+          for(let i=0;i<path.length;i++){
+            points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+          }
+          passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          // console.log(path);
+        }
+
+        //stage = 1 前往进站闸机
+        if(humanlist.children[i].stage == 1){
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+
+            targetPosition = passerZone.getgateposition("entergate");
+
+            path = pathFinder.find(points[0],targetPosition.point);
+
+            humanlist.children[i].door = targetPosition.door;
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+            }
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 2 过闸机
+        if(humanlist.children[i].stage == 2){
+            let points = [];
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+            points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z-5));
+
+            passerCheckDoor.checkDoorControl("in",humanlist.children[i].door,deviceaction)
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+        }
+
+        //stage = 3 前往站台
+        if(humanlist.children[i].stage == 3){
+
+          let direct = Math.floor(Math.random()*(2))+1;
+          // console.log(direct);
+          let points = [];
+          points.push(new THREE.Vector3(humanlist.children[i].position.x,humanlist.children[i].position.y,humanlist.children[i].position.z));
+          // points.push(new THREE.Vector3(11.81,9.8,13.11));
+
+          //1--top
+          //2-- down
+          if(humanlist.children[i].overGoal == "top"){
+            targetPosition = passerZone.getstandposition("standtop");
+            path = pathFinder.find(points[0],targetPosition.point);
+            humanlist.children[i].direct = "top";
+          }else{
+            targetPosition = passerZone.getstandposition("standdown");
+            path = pathFinder.find(points[0],targetPosition.point);
+            humanlist.children[i].direct = "down";
+          }
+          if(path != null){
+            if(path[0].y<9.84){
+              points.push(new THREE.Vector3(11.81,9.8,13.11));
+              points.push(new THREE.Vector3(29.5,1.77,13.16));
+
+            }
+            for(let i=0;i<path.length;i++){
+              points.push(new THREE.Vector3(path[i].x,path[i].y,path[i].z));
+            }
+            humanlist.children[i].door = targetPosition.door;
+            passerHuman.initMoveAnimate(humanlist.children[i],i,points,i);
+          }else{
+            humanlist.children[i].position.x += 0.05;
+          }
+
+        }
+
+
+
+      }
+    }
+
+  }
+}
diff --git a/src/jlmap3d/jl3dtrafficplan/passerai/pathfinder.js b/src/jlmap3d/jl3dtrafficplan/passerai/pathfinder.js
new file mode 100644
index 000000000..039f833dc
--- /dev/null
+++ b/src/jlmap3d/jl3dtrafficplan/passerai/pathfinder.js
@@ -0,0 +1,69 @@
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+import { Pathfinding } from '@/jlmap3d/utils/pathfinder/Pathfinding.js';
+import { OBJLoader } from '@/jlmap3d/main/loaders/OBJLoader';
+
+export function PathFinder(){
+  let scope = this;
+  this.navmesh = null;
+
+  const ZONE = 'level';
+	const SPEED = 10;
+	const OFFSET = 0.2;
+	THREE.Pathfinding = Pathfinding;
+	let groupID,path,level;
+	let playerPosition = new THREE.Vector3( -3.5, 0.5, 5.5 );
+
+	let pathFinder = new THREE.Pathfinding();
+
+
+
+	let loaderObj = new THREE.OBJLoader();
+
+	// load a resource
+	loaderObj.load(
+		// resource URL
+		JL3D_LOCAL_STATIC+'/jl3d/path/path.obj',
+		// called when resource is loaded
+		function ( object ) {
+
+
+			// console.time('createZone()');
+
+			const zone = THREE.Pathfinding.createZone(object.children[0].geometry);
+			// console.timeEnd('createZone()');
+
+			pathFinder.setZoneData( ZONE, zone );
+
+			const navWireframe = new THREE.Mesh(object.children[0].geometry, new THREE.MeshBasicMaterial({
+				color: 0x808080,
+				wireframe: true
+			}));
+			navWireframe.position.y = OFFSET / 2;
+			// scene.add(navWireframe);
+
+			scope.navmesh = object;
+
+
+			groupID = pathFinder.getGroup( ZONE, playerPosition );
+
+		},
+		// called when loading is in progresses
+		function ( xhr ) {
+
+			console.log( ( xhr.loaded / xhr.total * 100 ) + '% loaded' );
+
+		},
+		// called when loading has errors
+		function ( error ) {
+
+			console.log( 'An error happened' );
+
+		}
+	);
+  this.find = function(startPoint,targetPosition){
+    groupID = pathFinder.getGroup( ZONE, 	startPoint );
+    let resultPath = pathFinder.findPath( startPoint, targetPosition, ZONE, groupID );
+
+    return resultPath;
+  }
+}
diff --git a/src/jlmap3d/main/loaders/AssetLoader.js b/src/jlmap3d/main/loaders/AssetLoader.js
index 405aabfe8..8565e9f87 100644
--- a/src/jlmap3d/main/loaders/AssetLoader.js
+++ b/src/jlmap3d/main/loaders/AssetLoader.js
@@ -43,7 +43,7 @@ let waicestation = {
 }
 let station3 = {
   id:"10000",
-  name:"三站台",
+  name:"特殊站台",
   deviceType:"station3",
   type:"num4",
   picUrl:"",
diff --git a/src/jlmap3d/main/newmodel/StationStandListN.js b/src/jlmap3d/main/newmodel/StationStandListN.js
index 22486a36e..03e9a3645 100644
--- a/src/jlmap3d/main/newmodel/StationStandListN.js
+++ b/src/jlmap3d/main/newmodel/StationStandListN.js
@@ -179,12 +179,35 @@ export function StationStandListN() {
         }
 
       } );
-
-
+      //新车门动画获取待定
+      // let allClear = 0;
+      // for(let j=0;j<standsdata.length;j++){
+      //
+      //   allClear = 0;
+      //   for(let i=0;i<psddata.length;i++){
+      //
+      //     for(let n=0;n<standsdata[j].stands.length;n++){
+      //       if(psddata[i].standCode == standsdata[j].stands[n].code){
+      //         allClear++;
+      //         standsdata[j].stands[n].position = psddata[i].position;
+      //       }
+      //     }
+      //
+      //     if(allClear == standsdata[j].stands.length){
+      //       standsdata[j].stands.sort(compare);
+      //       i = psddata.length;
+      //     }
+      //   }
+      // }
+      //
+      //
+      // console.log(standsdata);
+      // console.log(psddata);
       for(let i=0;i<standsdata.length;i++){
         let newstationstand = new StationStandModel(standsdata[i]);
         // console.log(standsdata[i]);
         if(standsdata[i].code != "Station96090"){
+          console.log("3");
           newstationstand.code = standsdata[i].code;
           newstationstand.name = standsdata[i].name;
           newstationstand.type = "station";
@@ -236,6 +259,7 @@ export function StationStandListN() {
 
               let mixer = new THREE.AnimationMixer(  newstationmesh.children[j] );
 
+
               for(let n=0;n<psddata.length;n++){
                 for(let m=0;m<newstationstand.stands.length;m++){
 
@@ -305,118 +329,115 @@ export function StationStandListN() {
             }
           }
         }else{
-          newstationstand.code = standsdata[i].code;
-          newstationstand.name = standsdata[i].name;
-          newstationstand.type = "station";
-          newstationstand.num = i;
-          newstationstand.stand = [];
-          // newstationstand.direction1.code = standsdata[i].direction1.code;
-          // newstationstand.direction1.name = standsdata[i].direction1.name;
-          // newstationstand.direction1.screenDoorOpenStatus = "01";
-          //
-          // newstationstand.direction2.code = standsdata[i].direction2.code;
-          // newstationstand.direction2.name = standsdata[i].direction2.name;
-          // newstationstand.direction2.screenDoorOpenStatus = "01";
-          let newstationmesh = null;
-          newstationmesh = selectmesh3.clone(true);
-          newstationmesh.code = standsdata[i].code;
-          newstationmesh.name = standsdata[i].code;
-          newstationmesh.position.x = standsdata[i].position.x;
-          newstationmesh.position.y = standsdata[i].position.y;
-          newstationmesh.position.z = standsdata[i].position.z;
-          // newstationmesh.rotation.x = standsdata[i].rotation._x;
-          // newstationmesh.rotation.y = standsdata[i].rotation._y;
-          // newstationmesh.rotation.z = standsdata[i].rotation._z;
-          newstationstand.mesh = newstationmesh;
-          scope.group.add(newstationmesh);
-          //
-          scope.list[standsdata[i].code] = newstationstand;
-          //
-          let newclip =null;
-          newclip = selectmesh3.animations[ 0 ];
-          for(let j=0;j<newstationmesh.children.length;j++){
+        newstationstand.code = standsdata[i].code;
+        newstationstand.name = standsdata[i].name;
+        newstationstand.type = "station";
+        newstationstand.num = i;
+        newstationstand.stand = [];
+        // newstationstand.direction1.code = standsdata[i].direction1.code;
+        // newstationstand.direction1.name = standsdata[i].direction1.name;
+        // newstationstand.direction1.screenDoorOpenStatus = "01";
+        //
+        // newstationstand.direction2.code = standsdata[i].direction2.code;
+        // newstationstand.direction2.name = standsdata[i].direction2.name;
+        // newstationstand.direction2.screenDoorOpenStatus = "01";
+        let newstationmesh = null;
+        newstationmesh = selectmesh3.clone(true);
+        newstationmesh.code = standsdata[i].code;
+        newstationmesh.name = standsdata[i].code;
+        newstationmesh.position.x = standsdata[i].position.x;
+        newstationmesh.position.y = standsdata[i].position.y;
+        newstationmesh.position.z = standsdata[i].position.z;
+        // newstationmesh.rotation.x = standsdata[i].rotation._x;
+        // newstationmesh.rotation.y = standsdata[i].rotation._y;
+        // newstationmesh.rotation.z = standsdata[i].rotation._z;
+        newstationstand.mesh = newstationmesh;
+        scope.group.add(newstationmesh);
+        //
+        scope.list[standsdata[i].code] = newstationstand;
+        //
+        let newclip =null;
+        newclip = selectmesh3.animations[ 0 ];
+        for(let j=0;j<newstationmesh.children.length;j++){
 
-            if(newstationmesh.children[j].name == "top"){
-              newstationmesh.children[j].animations = [];
-              newstationmesh.children[j].animations.push(newclip.clone());
+          if(newstationmesh.children[j].name == "top"){
+            newstationmesh.children[j].animations = [];
+            newstationmesh.children[j].animations.push(newclip.clone());
 
-              let mixer = new THREE.AnimationMixer(  newstationmesh.children[j] );
-
-              for(let n=0;n<psddata.length;n++){
-                for(let n=0;n<psddata.length;n++){
-                  for(let m=0;m<newstationstand.stands.length;m++){
-                    console.log("====================");
-                    console.log(newstationstand.stands[m]);
-                    console.log(psddata[n]);
-                    if(psddata[n].standCode == newstationstand.stands[m].code && newstationstand.stands[m].right == false){
-                      let key = psddata[n].code;
-                      actionss[key] = {
-                        status:"01",
-                        action:mixer.clipAction( newstationmesh.children[j].animations[0])
-                      };
-                      actionss[key].action.setLoop(THREE.LoopOnce);
-                      actionss[key].action.clampWhenFinished = true;
-                      //actionss[key].play();
-                      mixers.push(mixer);
-                      n = psddata.length;
-                      m = newstationstand.stands.length;
-                    }
+            let mixer = new THREE.AnimationMixer(  newstationmesh.children[j] );
 
+            for(let n=0;n<psddata.length;n++){
+                for(let m=0;m<newstationstand.stands.length;m++){
+                  console.log("====================");
+                  console.log(newstationstand.stands[m]);
+                  console.log(psddata[n]);
+                  if(psddata[n].standCode == newstationstand.stands[m].code && newstationstand.stands[m].right == false){
+                    let key = psddata[n].code;
+                    actionss[key] = {
+                      status:"01",
+                      action:mixer.clipAction( newstationmesh.children[j].animations[0])
+                    };
+                    actionss[key].action.setLoop(THREE.LoopOnce);
+                    actionss[key].action.clampWhenFinished = true;
+                    //actionss[key].play();
+                    mixers.push(mixer);
+                    n = psddata.length;
+                    m = newstationstand.stands.length;
                   }
+
                 }
-              }
 
             }
-            if(newstationmesh.children[j].name == "down"){
-              newstationmesh.children[j].animations = [];
-              newstationmesh.children[j].animations.push(newclip.clone());
 
-              let mixer = new THREE.AnimationMixer( newstationmesh.children[j] );
-              for(let n=0;n<psddata.length;n++){
-                for(let n=0;n<psddata.length;n++){
-                  for(let m=0;m<newstationstand.stands.length;m++){
-                    console.log("====================");
-                    console.log(newstationstand.stands[m]);
-                    console.log(psddata[n]);
-                    if(psddata[n].standCode == newstationstand.stands[m].code && newstationstand.stands[m].right == true){
-                      let key = psddata[n].code;
-                      actionss[key] = {
-                        status:"01",
-                        action:mixer.clipAction( newstationmesh.children[j].animations[0])
-                      };
-                      actionss[key].action.setLoop(THREE.LoopOnce);
-                      actionss[key].action.clampWhenFinished = true;
-                      //actionss[key].play();
-                      mixers.push(mixer);
-                      n = psddata.length;
-                      m = newstationstand.stands.length;
-                    }
-
-                  }
-                }
-              }
-            }
           }
+          if(newstationmesh.children[j].name == "down"){
+            newstationmesh.children[j].animations = [];
+            newstationmesh.children[j].animations.push(newclip.clone());
+
+            let mixer = new THREE.AnimationMixer( newstationmesh.children[j] );
+            for(let n=0;n<psddata.length;n++){
+                for(let m=0;m<newstationstand.stands.length;m++){
+                  console.log("====================");
+                  console.log(newstationstand.stands[m]);
+                  console.log(psddata[n]);
+                  if(psddata[n].standCode == newstationstand.stands[m].code && newstationstand.stands[m].right == true){
+                    let key = psddata[n].code;
+                    actionss[key] = {
+                      status:"01",
+                      action:mixer.clipAction( newstationmesh.children[j].animations[0])
+                    };
+                    actionss[key].action.setLoop(THREE.LoopOnce);
+                    actionss[key].action.clampWhenFinished = true;
+                    //actionss[key].play();
+                    mixers.push(mixer);
+                    n = psddata.length;
+                    m = newstationstand.stands.length;
+                  }
+
+                }
 
-          if(mode){
-            if(mode == "02"){
-              let textgeometry = new THREE.PlaneBufferGeometry( 65, 90, 1 );
-              let textt = new THREE.CanvasTexture(getTextCanvas(standsdata[i]));
-              let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
-              let textplane = new THREE.Mesh( textgeometry, textmaterial );
-              textplane.name = standsdata[i].code;
-              textplane.position.y = 70;
-              textplane.rotation.x = Math.PI/2;
-              textplane.position.z = 50;
-              scope.textlist.push(textplane);
-              newstationmesh.add(textplane);
-              textgeometry.dispose();
-              textmaterial.dispose();
-              textt.dispose();
             }
           }
         }
 
+        if(mode){
+          if(mode == "02"){
+            let textgeometry = new THREE.PlaneBufferGeometry( 65, 90, 1 );
+            let textt = new THREE.CanvasTexture(getTextCanvas(standsdata[i]));
+            let textmaterial = new THREE.MeshBasicMaterial( { side: THREE.DoubleSide,map:textt ,transparent: true} );
+            let textplane = new THREE.Mesh( textgeometry, textmaterial );
+            textplane.name = standsdata[i].code;
+            textplane.position.y = 70;
+            textplane.rotation.x = Math.PI/2;
+            textplane.position.z = 50;
+            scope.textlist.push(textplane);
+            newstationmesh.add(textplane);
+            textgeometry.dispose();
+            textmaterial.dispose();
+            textt.dispose();
+          }
+        }
+      }
       }
 
       // scene.add(scope.textlist);
@@ -428,6 +449,17 @@ export function StationStandListN() {
 
   }
 }
+var compare = function (obj1, obj2) {
+    var val1 = obj1.position.y;
+    var val2 = obj2.position.y;
+    if (val1 < val2) {
+        return -1;
+    } else if (val1 > val2) {
+        return 1;
+    } else {
+        return 0;
+    }
+}
 //canvas文字贴图方法
 //PS:待提炼 增强功能
 var stationcanvas = new Image();
diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js
index f40879aaa..5c0308133 100644
--- a/src/jmapNew/config/skinCode/bejing_01.js
+++ b/src/jmapNew/config/skinCode/bejing_01.js
@@ -383,9 +383,16 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 北京线车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: true,										// 公里标显示
             kilometerPosition: 'down', 							 	// 公里标位置
             fontWeight: 'bold',										// 文字错细
@@ -688,7 +695,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/chengdu_01.js b/src/jmapNew/config/skinCode/chengdu_01.js
index 8a69318ad..5a083dcd0 100644
--- a/src/jmapNew/config/skinCode/chengdu_01.js
+++ b/src/jmapNew/config/skinCode/chengdu_01.js
@@ -335,9 +335,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 成都一号线车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: false,										// 公里标显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
@@ -612,7 +619,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/chengdu_03.js b/src/jmapNew/config/skinCode/chengdu_03.js
index 171d3313f..6e34272f1 100644
--- a/src/jmapNew/config/skinCode/chengdu_03.js
+++ b/src/jmapNew/config/skinCode/chengdu_03.js
@@ -332,9 +332,16 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true									// 公里标名称显示
-            // },
+            // 成都三号线车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: false,										// 公里标显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
@@ -798,7 +805,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/foshan_01.js b/src/jmapNew/config/skinCode/foshan_01.js
index 08ba7fc49..72e90c9ab 100644
--- a/src/jmapNew/config/skinCode/foshan_01.js
+++ b/src/jmapNew/config/skinCode/foshan_01.js
@@ -342,9 +342,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 佛山有轨电车 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: true,										// 公里标显示
             kilometerPosition: 'up',									// 公里标朝向
             text: {
@@ -649,7 +656,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/fuzhou_01.js b/src/jmapNew/config/skinCode/fuzhou_01.js
index 669521a8a..db8739e34 100644
--- a/src/jmapNew/config/skinCode/fuzhou_01.js
+++ b/src/jmapNew/config/skinCode/fuzhou_01.js
@@ -338,9 +338,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 福州一号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: true,										// 公里标显示
             kilometerPosition: 'up',									// 公里标朝向
             text: {
@@ -648,7 +655,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js
index 58921660f..b624b709f 100644
--- a/src/jmapNew/config/skinCode/haerbin_01.js
+++ b/src/jmapNew/config/skinCode/haerbin_01.js
@@ -374,9 +374,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true									// 公里标名称显示
-            // },
+            // 哈尔滨一号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[2, 6], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:1 // 字体边框宽度
+            },
+
             kmPostShow: true,								// 公里标显示
             kilometerPosition: 'up',						// 公里标朝向
             text: {
@@ -722,7 +729,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗,
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 4f4dfccaf..a8b58e64c 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -192,9 +192,16 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 宁波一号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: false,										// 公里标显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
@@ -681,7 +688,6 @@ class SkinCode extends defaultStyle {
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
                 trainHeadColorChangeMode: 1, // 1:driveMode + runlevel
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:false // 鼠标悬停列车状态信息框是否显示
             },
             mouseOverStyle:{
diff --git a/src/jmapNew/config/skinCode/ningbo_03.js b/src/jmapNew/config/skinCode/ningbo_03.js
index ac71be77f..02fc2e07c 100644
--- a/src/jmapNew/config/skinCode/ningbo_03.js
+++ b/src/jmapNew/config/skinCode/ningbo_03.js
@@ -231,9 +231,16 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 宁波三号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: false,										// 公里标显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
@@ -741,7 +748,6 @@ class SkinCode extends defaultStyle {
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
                 trainHeadColorChangeMode: 1, // 1:driveMode + runlevel
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:false // 鼠标悬停列车状态信息框是否显示
             },
             mouseOverStyle:{
diff --git a/src/jmapNew/config/skinCode/race_01.js b/src/jmapNew/config/skinCode/race_01.js
index 8d8c4f0cd..ec4c206a0 100644
--- a/src/jmapNew/config/skinCode/race_01.js
+++ b/src/jmapNew/config/skinCode/race_01.js
@@ -413,9 +413,16 @@ class SkinCode extends defaultStyle {
         };
 
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 竞赛线路 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: true,										// 公里标显示
             kilometerPosition: 'down', 							 	// 公里标位置
             fontWeight: 'bold',										// 文字错细
@@ -722,7 +729,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js
index dedc4203f..e3fda6713 100644
--- a/src/jmapNew/config/skinCode/xian_01.js
+++ b/src/jmapNew/config/skinCode/xian_01.js
@@ -355,9 +355,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 西安一号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: true,										// 公里标显示
             kilometerPosition: 'up',									// 公里标朝向
             text: {
@@ -713,7 +720,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 1, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 2, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/config/skinCode/xian_02.js b/src/jmapNew/config/skinCode/xian_02.js
index 97b63f7cc..c5d687bb4 100644
--- a/src/jmapNew/config/skinCode/xian_02.js
+++ b/src/jmapNew/config/skinCode/xian_02.js
@@ -382,9 +382,16 @@ class SkinCode extends defaultStyle {
             }
         };
         this[deviceType.Station] = {
-            // text: {
-            // 	show: true											// 公里标名称显示
-            // },
+            // 西安二号线 车站元素 车站名称
+            elemnetType:['stationText'],
+            stationText:{
+                z:0,
+                fontWeight:'normal', // 字体粗细
+                textPadding:[0, 0], // 字体边距
+                borderColor:'', // 字体边框颜色
+                textBorderWidth:0 // 字体边框宽度
+            },
+
             kmPostShow: false,										// 公里标显示
             kilometerPosition: 'up',							// 公里标朝向
             text: {
@@ -793,7 +800,6 @@ class SkinCode extends defaultStyle {
                 haveArrowText: true, // 是否需创建arrowText对象
                 textOffset: 4, // 字体偏移（用以控制字体据车头的距离）
                 trainWidthMoreText: 8, // 计算列车长度时--列车长比text多出尺寸
-                displayPosition: 'margin', // 非同通信车在物理区段（有逻辑区段）上显示的位置 margin:行驶方向边缘车次窗 center: 中间位置车次窗
                 trainTip:true // 鼠标悬停列车状态信息框是否显示
             },
             trainStatusStyle: {
diff --git a/src/jmapNew/painter.js b/src/jmapNew/painter.js
index 637772076..e4d93be0b 100644
--- a/src/jmapNew/painter.js
+++ b/src/jmapNew/painter.js
@@ -87,41 +87,40 @@ class Painter {
         }
     }
 
-    checkIntersect(device) {
-        var intersect = false;
-        var befor = device.instance;
-        var train = shapefactory(device, this.$jmap);
-
+    checkTrainOverlap(device) { // 检查重叠列车
+        const trainWindowCode = device.trainWindowCode;
+        const overlapTrainList = [device.code];
         this.mapInstanceLevel[deviceType.Train].eachChild(elem => {
-            if (elem !== befor && elem.getBoundingRect().intersect(train.getBoundingRect())) {
-                intersect = true;
-                return;
+            if (elem.model.code !== device.code && elem.model.trainWindowCode === trainWindowCode) {
+                overlapTrainList.push(elem.model.code);
+            }
+        });
+        if (overlapTrainList.length > 1) {
+            this.sortOverLapTrain(overlapTrainList);
+        }
+        return overlapTrainList;
+    }
+    sortOverLapTrain(overlapTrainList) { // 对重叠列车按照区段上的位置进行排序
+        overlapTrainList.sort((a, b) => {
+            const trainA = this.$jmap.getDeviceByCode(a);
+            const trainB = this.$jmap.getDeviceByCode(b);
+            if (trainA.right) {
+                return trainA.offsetp - trainB.offsetp;
+            } else {
+                return trainB.offsetp - trainA.offsetp;
             }
         });
-
-        return intersect;
     }
-
     /**
 	 * 更新列车
 	 * @param {*} device
 	 */
     updateTrain(device) {
-        var oldTrainWindowModel = null;
-        var instance = device.instance;
-        var curModel = device;
-        let displayPosition = 'margin';
-        if (instance) {
-            oldTrainWindowModel = device.trainWindowModel;
-            displayPosition = instance.style.Train.common.displayPosition;
-        }
+        const curModel = device;
         if (curModel.sectionCode) {
             curModel.sectionModel = this.$jmap.getDeviceByCode(curModel.sectionCode);
             if (curModel.sectionModel.trainWindowCode) {
                 curModel.trainWindowCode = curModel.sectionModel.trainWindowCode;
-            } else if (displayPosition === 'center' && curModel.sectionModel.logicSectionCodeList && curModel.sectionModel.logicSectionCodeList.length) {
-                const sec = this.$jmap.getDeviceByCode(curModel.sectionModel.logicSectionCodeList[Math.floor(curModel.sectionModel.logicSectionCodeList.length / 2)]);
-                curModel.trainWindowCode = sec.trainWindowCode;
             } else if (curModel.right && curModel.sectionModel.logicSectionCodeList && curModel.sectionModel.logicSectionCodeList.length) {
                 const sec = this.$jmap.getDeviceByCode(curModel.sectionModel.logicSectionCodeList[curModel.sectionModel.logicSectionCodeList.length - 1]);
                 curModel.trainWindowCode = sec.trainWindowCode;
@@ -134,13 +133,13 @@ class Painter {
         if (curModel.trainWindowCode) {
             curModel.trainWindowModel = this.$jmap.getDeviceByCode(curModel.trainWindowCode);
         }
-
-        if (instance && oldTrainWindowModel && this.checkIntersect(device)) {
-            device.trainWindowModel = oldTrainWindowModel;
-        }
-
-        instance && this.mapInstanceLevel[deviceType.Train].remove(instance);
-        this.add(device);
+        const overlapTrainList = this.checkTrainOverlap(device);
+        overlapTrainList.forEach((item, index) => {
+            const trainDevice = this.$jmap.getDeviceByCode(item);
+            trainDevice.overLapIndex = index;
+            trainDevice.instance && this.mapInstanceLevel[deviceType.Train].remove(trainDevice.instance);
+            this.add(trainDevice);
+        });
 
         if (this.screenFlag) {
             this.$transformHandleScreen.transformView(device.instance);
@@ -233,7 +232,6 @@ class Painter {
                     y: transPoint[1]
                 };
             }
-
         }
     }
 
diff --git a/src/jmapNew/shape/Station/EStationText.js b/src/jmapNew/shape/Station/EStationText.js
new file mode 100644
index 000000000..f90c552d3
--- /dev/null
+++ b/src/jmapNew/shape/Station/EStationText.js
@@ -0,0 +1,75 @@
+import Group from 'zrender/src/container/Group';
+import Text from 'zrender/src/graphic/Text';
+
+class EStationText extends Group {
+    constructor(model) {
+        super();
+        this.model = model;
+        this.create();
+    }
+
+    create() {
+        const model = this.model.modelData;
+        const style = this.model.style;
+
+        //  车站名称
+        this.stationName = new Text({
+            zlevel: this.model.zlevel,
+            z: this.model.z,
+            silent: !model.visible || false,
+            style: {
+                x: model.position.x,
+                y: model.position.y,
+                fontWeight: style.Station.stationText.fontWeight,
+                fontSize: isNaN(Number(model.nameFont)) ? 20 : Number(model.nameFont),
+                fontFamily: style.fontFamily,
+                text: model.number ? model.number + model.name : model.name,
+                textAlign: 'middle',
+                textFill: model.nameFontColor,
+                textVerticalAlign: 'top',
+                textPadding:style.Station.stationText.textPadding,
+                textBorderColor:style.Station.stationText.borderColor || model.nameFontColor,
+                textBorderWidth:style.Station.stationText.textBorderWidth
+            }
+        });
+        this.add(this.stationName);
+        if (model.subheadDisplay) { // 副标题
+            this.subheadText = new Text({
+                zlevel: this.model.zlevel,
+                z: this.model.z,
+                silent: !model.visible || false,
+                style: {
+                    x: model.subheadPosition.x,
+                    y: model.subheadPosition.y,
+                    fontWeight: model.fontWeight,
+                    fontSize: model.subheadFont || 18,
+                    fontFamily: style.fontFamily,
+                    text: model.subhead,
+                    textAlign: 'middle',
+                    textVerticalAlign: 'top',
+                    textFill: model.subheadFontColor,
+                    textPadding:style.Station.stationText.textPadding,
+                    textBorderColor:style.Station.stationText.borderColor || model.nameFontColor,
+                    textBorderWidth:style.Station.stationText.textBorderWidth
+                }
+            });
+            this.add(this.subheadText);
+        }
+    }
+
+    recover() {
+    }
+
+    setState() {
+    }
+
+    setColor(color) {
+        const style = this.model.style;
+        if (style.Station.StationControl.disPlayNone) {
+            this.stationName.setStyle('textFill', color);
+            this.subheadText && this.subheadText.setStyle('textFill', color);
+        }
+    }
+}
+
+export default EStationText;
diff --git a/src/jmapNew/shape/Station/index.js b/src/jmapNew/shape/Station/index.js
index f24fbe4e6..13ca73a0d 100644
--- a/src/jmapNew/shape/Station/index.js
+++ b/src/jmapNew/shape/Station/index.js
@@ -11,6 +11,10 @@ import { arrow } from '../utils/ShapePoints';
 import Rect from 'zrender/src/graphic/shape/Rect';
 import Text from 'zrender/src/graphic/Text';
 import store from '@/store/index_APP_TARGET';
+
+import EStationText from './EStationText';
+import {traverseLineElements, traverseStatusElements} from '../utils/ShapeStatusCovert';
+
 import Vue from 'vue';
 
 export default class Station extends Group {
@@ -28,37 +32,21 @@ export default class Station extends Group {
         this.createControlMode();
         this.setState(model);
         this.checkIsDrawMap();
+        this.setVisible(model.visible);
     }
 
     create() {
         const model = this.model;
         const style = this.style;
 
-        // 公里标名称是否显示
-        this.stationText = new ETextName({
-            zlevel: this.zlevel,
-            z: this.z,
-            x: model.position.x,
-            y: model.position.y,
-            fontWeight: style.Station.text.fontWeight,
-            fontSize: isNaN(Number(model.nameFont)) ? 20 : Number(model.nameFont),
-            fontFamily: style.fontFamily,
-            silent: !model.visible,
-            text: model.number ? model.number + model.name : model.name,
-            textAlign: 'middle',
-            textVerticalAlign: 'top',
-            textFill: model.nameFontColor
-        });
-        this.add(this.stationText);
-        if (style.Station.text.borderShow) { // 哈尔滨线路单独显示
-            this.stationText.attr({
-                style: {
-                    textPadding: style.Station.text.textPadding || [2, 6],
-                    textBorderColor: style.Station.text.borderColor || model.nameFontColor,
-                    textBorderWidth: style.Station.text.textBorderWidth || 1
-                }
-            });
-        }
+        // // 站台所有的绘图元素
+        const elementTypeList = {
+            'stationText':EStationText // 车站名称   （普通站台样式）
+        };
+
+        // 遍历当前线路下的绘图元素 组合模式
+        traverseLineElements(style.Station, elementTypeList, model, style, this);
+
         const path = window.location.href;
         if (style.Station.kmPostShow || path.includes('/map/draw')) { // 公里标是否显示
             let direction = 1;
@@ -88,37 +76,13 @@ export default class Station extends Group {
             this.add(this.mileageText);
             model.kmPostShow ? this.mileageText.show() : this.mileageText.hide();
         }
-        if (model.subheadDisplay) { // 副标题
-            this.subheadText = new ETextName({
-                zlevel: this.zlevel,
-                z: this.z,
-                x: model.subheadPosition.x,
-                y: model.subheadPosition.y,
-                fontWeight: model.fontWeight,
-                fontSize: model.subheadFont || 18,
-                fontFamily: style.fontFamily,
-                text: model.subhead,
-                silent: !model.visible,
-                textAlign: 'middle',
-                textVerticalAlign: 'top',
-                textFill: model.subheadFontColor
-            });
-            this.add(this.subheadText);
-            if (style.Station.text.borderShow) {
-                this.subheadText.attr({
-                    style: {
-                        textPadding: [2, 6],
-                        textBorderColor: model.nameFontColor,
-                        textBorderWidth: 1
-                    }
-                });
-            }
-        }
-        if (!model.visible) { // 隐藏车站
-            this.subheadText && this.subheadText.setStyle('textFill', 'rgba(0,0,0,0)');
-            this.mileageText && this.mileageText.setStyle('textFill', 'rgba(0,0,0,0)');
-            this.stationText && this.stationText.setStyle('textFill', 'rgba(0,0,0,0)');
-        }
+
+        // if (!model.visible) { // 隐藏车站
+        //     // this.subheadText && this.subheadText.setStyle('textFill', 'rgba(0,0,0,0)');
+        //     // this.mileageText && this.mileageText.setStyle('textFill', 'rgba(0,0,0,0)');
+        //     // this.stationText && this.stationText.setStyle('textFill', 'rgba(0,0,0,0)');
+        //     this.eachChild(elem => { elem.hide(); });
+        // }
     }
     createTurnBack() { // 创建按图折返
         const model = this.model;
@@ -361,12 +325,13 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.greenColor);
         this.centerControl && this.centerControl.setTextColor(this.style.Station.StationControl.lamp.greenColor); // 文字颜色
-        if (this.style.Station.StationControl.disPlayNone) {
-            this.stationText && this.stationText.setStyle('textFill', '#1fdc1f');
-            if (this.model.subheadDisplay) { // 副标题
-                this.subheadText && this.subheadText.setStyle('textFill', '#1fdc1f');
-            }
-        }
+        this.stationText.setColor('#1fdc1f');
+        // if (this.style.Station.StationControl.disPlayNone) {
+        //     this.stationText && this.stationText.setStyle('textFill', '#1fdc1f');
+        //     if (this.model.subheadDisplay) { // 副标题
+        //         this.subheadText && this.subheadText.setStyle('textFill', '#1fdc1f');
+        //     }
+        // }
     }
 
     handleLocal() { // 站控
@@ -375,12 +340,13 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setTextColor(this.style.Station.StationControl.lamp.yellowColor); // 文字颜色
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.substationArrowsControl && this.substationArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
-        if (this.style.Station.StationControl.disPlayNone) {
-            this.stationText && this.stationText.setStyle('textFill', '#fff');
-            if (this.model.subheadDisplay) { // 副标题
-                this.subheadText && this.subheadText.setStyle('textFill', '#fff');
-            }
-        }
+        // if (this.style.Station.StationControl.disPlayNone) {
+        //     this.stationText && this.stationText.setStyle('textFill', '#fff');
+        //     if (this.model.subheadDisplay) { // 副标题
+        //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
+        //     }
+        // }
+        this.stationText.setColor('#fff');
     }
 
     handleEmergency() { // 紧急站控
@@ -389,23 +355,32 @@ export default class Station extends Group {
         this.substationControl && this.substationControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.centerControl && this.centerControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.emergencyArrowsControl && this.emergencyArrowsControl.setColor(this.style.Station.StationControl.lamp.greenColor);
-        if (this.style.Station.StationControl.disPlayNone) {
-            this.stationText && this.stationText.setStyle('textFill', '#fff');
-            if (this.model.subheadDisplay) { // 副标题
-                this.subheadText && this.subheadText.setStyle('textFill', '#fff');
-            }
-        }
+        // if (this.style.Station.StationControl.disPlayNone) {
+        //     this.stationText && this.stationText.setStyle('textFill', '#fff');
+        //     if (this.model.subheadDisplay) { // 副标题
+        //         this.subheadText && this.subheadText.setStyle('textFill', '#fff');
+        //     }
+        // }
+        this.stationText.setColor('#fff');
     }
 
     handleNone() { // 空
-        if (this.style.Station.StationControl.disPlayNone) { // 没有控制时显示 黄色
-            this.stationText && this.stationText.setStyle('textFill', '#FFFF00');
-            if (this.model.subheadDisplay) { // 副标题
-                this.subheadText && this.subheadText.setStyle('textFill', '#FFFF00');
-            }
-        }
+        // if (this.style.Station.StationControl.disPlayNone) { // 没有控制时显示 黄色
+        //     this.stationText && this.stationText.setStyle('textFill', '#FFFF00');
+        //     if (this.model.subheadDisplay) { // 副标题
+        //         this.subheadText && this.subheadText.setStyle('textFill', '#FFFF00');
+        //     }
+        // }
+        this.stationText.setColor('#FFFF00');
     }
 
+    // /** 恢复初始状态*/
+    // recover() {
+    //     const currentTypeList = this.style.Station.elemnetType;
+    //     currentTypeList.forEach(element => {
+    //         this[element].recover();
+    //     });
+    // }
     recover() {
         this.emergencyControl && this.emergencyControl.setColor(this.style.Station.StationControl.lamp.grayColor);
         this.emergencyControl && this.emergencyControl.setTextColor(this.style.Station.StationControl.text.fontColor);
@@ -433,6 +408,18 @@ export default class Station extends Group {
         }
     }
 
+    // setState(model) {
+    //     if (!this.isShowShape) return;
+    //     // // 新版地图使用新版状态变更方式
+    //     this.recover();
+
+    //     // 更新状态
+    //     const currentTypeList = this.style.Station.elemnetType;
+    //     currentTypeList.forEach(element => {
+    //         this[element].setState(model);
+    //     });
+    // }
+
     getShapeTipPoint(opts) {
         let rect;
         if (opts.subDeviceType === 'button') {
@@ -448,13 +435,14 @@ export default class Station extends Group {
 
     getBoundingRect() {
         const rect = this.stationText.getBoundingRect().clone();
-        if (this.model.subheadDisplay) {
-            const subheadText = this.subheadText.getBoundingRect().clone();
-            rect.union(subheadText);
-            return rect;
-        } else {
-            return rect;
-        }
+        // if (this.model.subheadDisplay) {
+        //     const subheadText = this.subheadText.getBoundingRect().clone();
+        //     rect.union(subheadText);
+        //     return rect;
+        // } else {
+        //     return rect;
+        // }
+        return rect;
     }
 
     drawSelected(selected) {
@@ -489,4 +477,12 @@ export default class Station extends Group {
             this.isShowShape = false;
         }
     }
+
+    setVisible(visible) {
+        if (visible) {
+            this.eachChild(elem => { elem.show(); });
+        } else {
+            this.eachChild(elem => { elem.hide(); });
+        }
+    }
 }
diff --git a/src/jmapNew/shape/StationStand/index.js b/src/jmapNew/shape/StationStand/index.js
index 540cdfc97..d3b640253 100644
--- a/src/jmapNew/shape/StationStand/index.js
+++ b/src/jmapNew/shape/StationStand/index.js
@@ -63,6 +63,7 @@ class StationStand extends Group {
         // 加载皮肤控制的元素
         const model = this.model;
         const style = this.style;
+
         // // 站台所有的绘图元素
         const elementTypeList = {
             'solidStand':ESolidStand, // 矩形实心站台   （普通站台样式）
diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index 55913cfa3..faa2404aa 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -46,10 +46,10 @@ export default class Train extends Group {
             };
             if (model.right) {
                 this.point.x = this.point.x - style.Train.trainHead.trainConntWidth * this.newScale - style.Train.common.trainWidth / 2;
-                this.point.y = this.point.y - style.Train.common.trainHeight / 2;
+                this.point.y = this.point.y - style.Train.common.trainHeight / 2 + model.overLapIndex * (style.Train.common.trainHeight + 5);
             } else {
                 this.point.x = this.point.x + style.Train.trainHead.trainConntWidth * this.newScale - style.Train.common.trainWidth / 2;
-                this.point.y = this.point.y + model.trainWindowModel.height - style.Train.common.trainHeight / 2;
+                this.point.y = this.point.y + model.trainWindowModel.height - style.Train.common.trainHeight / 2 - model.overLapIndex * (style.Train.common.trainHeight + 5);
             }
         } else {
             this.point = model.position;
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
index 76f80c3c8..50c7654c3 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/alxeEffective.vue
@@ -111,7 +111,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import PopupAlarm from './childDialog/popupAlarm';
@@ -425,7 +425,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue
index 0edcbe768..a376ba4dd 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTip.vue
@@ -1,59 +1,69 @@
 <template>
-    <el-dialog class="beijing-01__systerm confirm-control-speed" :title="title" :visible.sync="show" width="340px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="height: 60px; padding-left: 20px">
-            <span style="font-size: 18px">{{message}}</span>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="11">
-                <el-button type="primary" :id="confirmId" @click="confirm">确定</el-button>
-            </el-col>
-            <el-col :span="11" :offset="2">
-                <el-button @click="doClose">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm confirm-control-speed"
+    :title="title"
+    :visible.sync="show"
+    width="340px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="height: 60px; padding-left: 20px">
+      <span style="font-size: 18px">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="11">
+        <el-button :id="confirmId" type="primary" @click="confirm">确定</el-button>
+      </el-col>
+      <el-col :span="11" :offset="2">
+        <el-button @click="doClose">取 消</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
-    export default {
-        name: 'ConfirmTip',
-        data() {
-            return {
-                dialogShow: false,
-                message: '',
-                confirmId: '',
-            }
+export default {
+    name: 'ConfirmTip',
+    data() {
+        return {
+            dialogShow: false,
+            message: '',
+            confirmId: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                if (this.dialogShow) {
-                    return "提示";
-                }
+        title() {
+            if (this.dialogShow) {
+                return '提示';
             }
-        },
-        mounted() {
+            return '';
+        }
+    },
+    mounted() {
 
+    },
+    methods: {
+        doShow(operate) {
+            this.message = operate.message;
+            this.dialogShow = true;
+            this.confirmId = operate.confirmId;
         },
-        methods: {
-            doShow(operate) {
-                this.message = operate.message;
-                this.dialogShow = true;
-                this.confirmId = operate.confirmId;
-            },
-            confirm() {
-                this.$emit('close');
-            },
-            doClose() {
-                this.dialogShow = false;
-            }
+        confirm() {
+            this.$emit('close');
+        },
+        doClose() {
+            this.dialogShow = false;
         }
     }
+};
 
 </script>
 <style scoped>
@@ -65,4 +75,4 @@
         display: block;
         margin: 0 auto;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
index 0b657cdd8..b3e620c49 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/confirmTrain.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -141,7 +141,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -158,7 +158,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
index 617c619e0..d3b53ee33 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/childDialog/popupAlarm.vue
@@ -1,85 +1,94 @@
 <template>
-    <el-dialog class="beijing-01__systerm popup-alarm" :title="title" :visible.sync="show" width="500px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <el-row>
-            <el-col :offset="2">
-                <span v-for="message in messages">{{message}}</span><br>
-            </el-col>
-        </el-row>
-        <el-row justify="center" class="button-group">
-            <el-col :span="10" :offset="8">
-                <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
-            </el-col>
-        </el-row>
-        </span>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm popup-alarm"
+    :title="title"
+    :visible.sync="show"
+    width="500px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <el-row>
+      <el-col :offset="2">
+        <span v-for="(message, index) in messages" :key="index">{{ message }}</span><br>
+      </el-col>
+    </el-row>
+    <el-row justify="center" class="button-group">
+      <el-col :span="10" :offset="8">
+        <el-button :id="domIdSure" type="primary" @click="commit">确定</el-button>
+      </el-col>
+    </el-row>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'Popup-Alarm',
-        data() {
-            return {
-                dialogShow: false,
-                messages: [],
-                operate: null,
-                operation: '',
-            }
+export default {
+    name: 'PopupAlarm',
+    data() {
+        return {
+            dialogShow: false,
+            messages: [],
+            operate: null,
+            operation: ''
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            title() {
-                return '弹出式告警';
-            },
-            domIdSure() {
-                return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
-            }
+        title() {
+            return '弹出式告警';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, messages) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
-                this.dialogShow = true;
-                this.messages = messages || [];
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.dialogShow = false;
+        domIdSure() {
+            return this.dialogShow ? OperationEvent.Command.close.alarm.domId : '';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, messages) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
+            this.dialogShow = true;
+            this.messages = messages || [];
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
-                    // 确认计轴有效
-                    this.alxeEffective();
-                }
-
-            },
-            alxeEffective() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.alarm.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                        this.doClose();
-                    }
-                })
+            });
+        },
+        doClose() {
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
+                // 确认计轴有效
+                this.alxeEffective();
             }
+
+        },
+        alxeEffective() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.alarm.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.doClose();
+                }
+            });
         }
     }
+};
 
 </script>
 <style>
@@ -87,4 +96,4 @@
         padding-bottom: 40px !important;
         border: 1px solid lightgray;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
index f0cae6718..f490d7217 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue
@@ -158,7 +158,7 @@ export default {
             };
             this.strategy = row.value;
             this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
index 3d4c4f2c6..bd08e779f 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue
@@ -18,7 +18,7 @@
       style="background: #f0f0f0;"
     >
       <div slot-scope="{ node, data }" style="height: 24px; width: 100%;">
-        <div v-if="data.level == 1" style="line-height: 26px;">{{ data.name }}</div>
+        <div v-if="data.level == 1" style="line-height: 26px;">{{ node.name }}</div>
         <div v-if="data.level == 2" style="background: lightgray; overflow: hidden; height: 100%;">
           <div
             style="width: 46%;float: left; height: 24px; line-height: 24px; padding-left: 5px; border-right: 1px solid #f0f0f0;"
@@ -64,7 +64,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -262,7 +263,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
index de74f773b..85befb629 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationCmdControl.vue
@@ -77,7 +77,8 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import { now } from '@/utils/date';
 
@@ -257,7 +258,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -284,7 +285,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -314,7 +315,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -345,7 +346,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -363,7 +364,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
index 0ba915c0f..22f8fffb7 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationHumanControlAll.vue
@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -91,7 +92,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -108,7 +109,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
index fdeb34bee..0c82bf292 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/stationSetRouteControlAll.vue
@@ -39,7 +39,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -110,7 +111,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -127,7 +128,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
index 2b819357e..7fa0902dd 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDefine.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
index 2783f61e7..82f527d75 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDelete.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import ConfirmControl from './childDialog/confirmControl';
@@ -120,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +138,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -158,7 +159,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
index 5ed8b4133..41bcb6f10 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainDeletePlan.vue
@@ -41,7 +41,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',
@@ -126,7 +127,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -146,7 +147,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
index 59b34c6fe..7056f38c9 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainEdit.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
index ce5a42461..4f6e1e1b5 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainFlag.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -118,7 +119,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -135,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
index cfa9a6e19..6af5ec33b 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMove.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
index 36267d1a8..11d6c0639 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainMoveEvently.vue
@@ -49,7 +49,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',
@@ -134,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -154,7 +155,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
index 96bbb1dfa..8de31e986 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetHead.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
index e87ce8c49..9a2f1402a 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetPlan.vue
@@ -37,7 +37,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -106,7 +107,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -121,7 +122,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -138,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
index 16ea5c998..fe7c0dbbd 100644
--- a/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/beijing_01/menus/dialog/trainSetWork.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mouseCancelState } from '@/jmapNew/theme/components/utils/menuItemStatus';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
@@ -108,7 +109,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -123,7 +124,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -140,7 +141,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuBar.vue b/src/jmapNew/theme/beijing_01/menus/menuBar.vue
index f066df3bc..a66f3adb1 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuBar.vue
@@ -99,7 +99,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
index 0c7555a39..06258bcf2 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userAdd.vue
@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="beijing-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -159,4 +169,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
index ec304506c..d2ba3392b 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userDelete.vue
@@ -1,126 +1,134 @@
 <template>
-    <el-dialog class="beijing-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding-left: 10px; padding-bottom: 10px">
-            <i class="el-icon-info"></i>
-            <template v-for="message in messages">
-                <span>{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="3">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <span v-for="(message, index) in messages" :key="index">{{ message }}</span>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserDelete',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                messages: [],
-                model: {
-                    type: 'DELETE',
-                    jobNumber: '',
-                    userName: '',
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.messages = operate.messages;
-                    this.model.userName = '';
-                    this.model.jobNumber = '';
-                    if (selected) {
-                        this.model.userName = selected.userName;
-                        this.model.jobNumber = selected.jobNumber;
-                    }
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '删除用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.model.userName && this.model.jobNumber) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            cancel() {
-                let operate = {
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
                     if (valid) {
                         this.doClose();
+                        this.$emit('operateUser', this.model);
                     }
-                }).catch(error => { this.doClose(); });
+                });
+            } else {
+                this.$messageBox('选择的用户名或工号为空');
             }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -131,4 +139,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
index ec87e0f81..0dc72a5a4 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/childDialog/userEdit.vue
@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="beijing-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -175,4 +186,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
index a60fbeeae..2fc0b1930 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorl.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -113,7 +114,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -141,7 +142,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -165,7 +166,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
index 0537100b9..58373b59e 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -113,7 +114,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -141,7 +142,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -165,7 +166,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
index 3881848e4..80d8e869e 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/helpAbout.vue
@@ -1,123 +1,133 @@
 <template>
-    <el-dialog class="beijing-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="height: 70px;">
-            <div style="position: relative; left: 10px;">
-            </div>
-            <div style="position: relative; left: 80px;">
-                <div style="width:100%">
-                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
-                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
-                        :loading="loading" @click="commit">确定</el-button>
-                </div>
-                <div style="width:100%; padding-top: 20px">
-                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
-                </div>
-            </div>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >确定</el-button>
         </div>
-        <div style="padding: 10px;  margin: 5px; ">
-            <el-table :data="tableData" style="width: 100%;" height="400">
-                <el-table-column prop="moduleName" label="模块名称" width="180">
-                </el-table-column>
-                <el-table-column prop="version" label="版本" width="180">
-                </el-table-column>
-                <el-table-column prop="updateDate" label="修改日期">
-                </el-table-column>
-            </el-table>
+        <div style="width:100%; padding-top: 20px">
+          <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
         </div>
-    </el-dialog>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" label="模块名称" width="180" />
+        <el-table-column prop="version" label="版本" width="180" />
+        <el-table-column prop="updateDate" label="修改日期" />
+      </el-table>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        data() {
-            return {
-                tableData: [
-                    {
-                        moduleName: '主程序版本:',
-                        version: '123',
-                        updateDate: '123'
-                    }
-                ],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '关于ControlMonitor'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: '主程序版本:',
+                    version: '123',
+                    updateDate: '123'
                 }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '关于ControlMonitor';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.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();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+                this.operate = operate || {};
+                this.operation = operate.operation;
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -128,4 +138,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
index 2ec6fadfa..62803376d 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/manageUser.vue
@@ -1,282 +1,300 @@
 <template>
-    <el-dialog class="beijing-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-            <span class="base-label">用户列表</span>
-            <el-row>
-                <el-col :span="18">
-                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
-                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
-                        <el-table-column prop="jobNumber" label="工号" width="120">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.jobNumber}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userName" label="用户名">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.userName}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column width="20">
-                        </el-table-column>
-                    </el-table>
-                </el-col>
-                <el-col :span="4">
-                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
-        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
-        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="beijing-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">用户列表</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" label="工号" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" label="用户名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">刷新
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">增加
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">修改
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">删除
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import UserAdd from './childDialog/userAdd';
-    import UserEdit from './childDialog/userEdit';
-    import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        components: {
-            UserAdd,
-            UserEdit,
-            UserDelete
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                tableData: [],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdAddUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-            },
-            domIdEditUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-            },
-            domIdDelUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-            },
-            domIdFreshUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-            },
-            domIdChooseUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '用户管理'
-            }
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '用户管理';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.addUser.operation,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
                 }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.$refs.userAdd.doShow(operate);
+                        this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
-                })
-            },
-            //编辑用户
-            editUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.editUser.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userEdit.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //删除用户
-            delUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.delUser.operation,
-                        messages: [`你确定删除用户${this.selected.userName}吗？`]
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userDelete.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //刷新用户
-            freshUser() {
-                let operate = {
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.manage.freshUser.operation,
-                }
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`你确定删除用户${this.selected.userName}吗？`]
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            //选择用户
-            chooseUser(row) {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.chooseUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.selected = row;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.doClose();
+                        this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            },
-            //增删改函数处理
-            operateUser(data) {
-                if (data && data.type === 'ADD') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index < 0) {
-                        this.tableData.push({
-                            jobNumber: data.jobNumber,
-                            userName: data.userName,
-                            password: data.password
-                        });
-                    } else {
-                        this.$messageBox('添加失败，存在相同工号的用户');
-                    }
-                } else if (data && data.type === 'EDIT') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData[index].password = data.password;
-                        this.tableData[index].userName = data.userName;
-                    } else {
-                        this.$messageBox('修改失败');
-                    }
-                } else if (data && data.type === 'DELETE') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData.splice(index, 1);
-                    } else {
-                        this.$messageBox('删除失败');
-                    }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox('添加失败，存在相同工号的用户');
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox('修改失败');
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                } else {
+                    this.$messageBox('删除失败');
                 }
             }
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -287,4 +305,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
index fb1ba7387..dab41a4c8 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/stationControl.vue
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
index 6bf8c82a0..9c2ab1ec8 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainAdd.vue
@@ -1,154 +1,167 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-                <span class="base-label">添加位置</span>
-                <div style="position: relative; top:-10px;">
-                    <el-form-item prop="stationStandCode">
-                        <span slot="label">终&emsp;&emsp;&emsp;端:</span>
-                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="前车车次号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
-                    </el-form-item>
-                </div>
-            </div>
-            <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-        </el-form>
-        <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="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">添加位置</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">终&emsp;&emsp;&emsp;端:</span>
+            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="前车车次号:" prop="trainNumberLimber">
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+      <el-form-item label="添加车次号:" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <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 { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                    trainNumberLimber: '',
-                },
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    // trainNumberLimber: [
-                    //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
-                    // ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                // trainNumberLimber: [
+                //     { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                // ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-            },
-            title() {
-                return '添加计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        },
+        title() {
+            return '添加计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } 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) {
-                        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');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        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/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -159,4 +172,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
index bbdd4bb4f..dd2710c1a 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainDelete.vue
@@ -1,141 +1,149 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item prop="stationStandCode">
-                <span slot="label">终&emsp;&emsp;端:</span>
-                <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                    <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item label="车 次 号:" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-        </el-form>
-        <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="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item prop="stationStandCode">
+        <span slot="label">终&emsp;&emsp;端:</span>
+        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+          <el-option v-for="item in stationStandList" :key="item.code" :label="item.name" :value="item.code" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车 次 号:" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+    </el-form>
+    <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 { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                },
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
-            },
-            title() {
-                return '删除计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.delPlanTrain.domId : '';
+        },
+        title() {
+            return '删除计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.delPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } 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) {
-                        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');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.delPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        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/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .beijing-01__systerm .el-dialog .base-label {
@@ -146,4 +154,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
index 8b62effb9..fe78e420f 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuDialog/trainTranstalet.vue
@@ -1,152 +1,165 @@
 <template>
-    <el-dialog class="beijing-01__systerm stand-stop-time" :title="title" :visible.sync="show" width="320px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="100px" :model="addModel" :rules="rules" ref="form">
-            <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
-                <el-input v-model="addModel.groupNumber"></el-input>
-            </el-form-item>
-            <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
-                <span class="base-label">目的</span>
-                <div style="position: relative; top:-10px;">
-                    <el-form-item prop="stationStandCode">
-                        <span slot="label">终&emsp;&emsp;端:</span>
-                        <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
-                            <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                :value="item.code">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item label="车 次 号:" prop="trainNumberLimber">
-                        <el-input v-model="addModel.trainNumberLimber"></el-input>
-                    </el-form-item>
-                </div>
-            </div>
-        </el-form>
-        <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="beijing-01__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="320px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="100px" :model="addModel" :rules="rules">
+      <el-form-item label="车 次 号:" label-width="115px" prop="groupNumber">
+        <el-input v-model="addModel.groupNumber" />
+      </el-form-item>
+      <div style="padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 120px;">
+        <span class="base-label">目的</span>
+        <div style="position: relative; top:-10px;">
+          <el-form-item prop="stationStandCode">
+            <span slot="label">终&emsp;&emsp;端:</span>
+            <el-select v-model="addModel.stationStandCode" filterable placeholder="请选择">
+              <el-option
+                v-for="item in stationStandList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="车 次 号:" prop="trainNumberLimber">
+            <el-input v-model="addModel.trainNumberLimber" />
+          </el-form-item>
+        </div>
+      </div>
+    </el-form>
+    <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 { mapGetters } from 'vuex';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainTranstalet',
-        components: {
-        },
-        data() {
-            return {
-                trainNoList: [],
-                addModel: {
-                    groupNumber: '',
-                    stationStandCode: '',
-                    trainNumberLimber: '',
-                },
+export default {
+    name: 'TrainTranstalet',
+    components: {
+    },
+    data() {
+        return {
+            trainNoList: [],
+            addModel: {
+                groupNumber: '',
+                stationStandCode: '',
+                trainNumberLimber: ''
+            },
 
-                rules: {
-                    groupNumber: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    trainNumberLimber: [
-                        { required: true, message: '请输入前车车次号', trigger: 'blur' }
-                    ],
-                    stationStandCode: [
-                        { required: true, message: '请选择终端', trigger: 'change' }
-                    ],
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+            rules: {
+                groupNumber: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                trainNumberLimber: [
+                    { required: true, message: '请输入前车车次号', trigger: 'blur' }
+                ],
+                stationStandCode: [
+                    { required: true, message: '请选择终端', trigger: 'change' }
+                ]
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
-            },
-            title() {
-                return '平移计划车'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.translatPlanTrain.domId : '';
+        },
+        title() {
+            return '平移计划车';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-                            type: MapDeviceType.Train.type,
-                            operation: OperationEvent.Command.planTrain.translatPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } 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) {
-                        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');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+                        type: MapDeviceType.Train.type,
+                        operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(() => {
+                        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/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
-</script>
\ No newline at end of file
+};
+</script>
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStation.vue b/src/jmapNew/theme/beijing_01/menus/menuStation.vue
index 595630474..8cfcd8e98 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStation.vue
@@ -193,7 +193,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.setAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -209,7 +209,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -224,7 +224,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.powerUnLock.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -238,7 +238,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.execKeyOperationTest.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -252,7 +252,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.humanControlALL.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationHumanControlAll.doShow(operate, this.selected);
@@ -266,7 +266,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Station.atsAutoControlALL.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
index 2e24b5e2e..dc075462a 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuStationStand.vue
@@ -249,22 +249,6 @@ export default {
                 }
             });
         },
-        // 强制取消扣车
-        // cancelDetainTrainForce() {
-        //     const operate = {
-        //         start: true,
-        //         code: this.selected.code,
-        //         type: MapDeviceType.StationStand.type,
-        //         label: MapDeviceType.StationStand.label,
-        //         operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation
-        //     };
-        //     this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-        //         if (valid) {
-        //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-        //             this.$refs.standControl.doShow(operate, this.selected);
-        //         }
-        //     });
-        // },
         // 设置跳停
         setJumpStop() {
             commitOperate(menuOperate.StationStand.setJumpStop, {standCode:this.selected.code}, 0).then(({ valid, operate })=>{
diff --git a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
index 9cac90607..71d502bdf 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuTrain.vue
@@ -393,7 +393,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.limitSpeed.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -418,7 +418,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.addTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDefine.doShow(operate, this.selected);
@@ -432,7 +432,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.delTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(operate, this.selected);
@@ -446,7 +446,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.moveTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(operate, this.selected);
@@ -460,7 +460,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEdit.doShow(operate, this.selected);
@@ -474,7 +474,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetPlan.doShow(operate, this.selected);
@@ -488,7 +488,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.moveEventlyTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMoveEvently.doShow(operate, this.selected);
@@ -502,7 +502,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.deletePlanTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDeletePlan.doShow(operate, this.selected);
@@ -516,7 +516,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetHead.doShow(operate, this.selected);
@@ -530,7 +530,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSetWork.doShow(operate, this.selected);
@@ -544,7 +544,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainFlag.doShow(operate, this.selected);
@@ -558,7 +558,7 @@ export default {
                 code: this.selected.code,
                 operation: OperationEvent.Train.editTrainId.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainFlag.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
index 56483d8d6..78e19c88a 100644
--- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/beijing_01/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
index 29c910040..8bbd4bbcd 100644
--- a/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/beijing_01/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
diff --git a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
index 756500d42..7fa4cd43f 100644
--- a/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/chengdu_01/menus/menuStation.vue
@@ -11,7 +11,6 @@ import PopMenu from '@/components/PopMenu';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CancelMouseState from '@/mixin/CancelMouseState';
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
diff --git a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
index 061b741a2..1f5a03706 100644
--- a/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/dialog/trainSwitch.vue
@@ -1,188 +1,205 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="640px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-form size="small" label-width="80px" :model="addModel" :rules="rules" ref="form">
-            <div style="overflow: hidden;">
-                <div
-                    style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px; margin-right: 4%;">
-                    <span class="base-label">源车次窗</span>
-                    <div style="position: relative; top:-10px;">
-                        <el-form-item label="车 组 号:" prop="trainNumberSource">
-                            <el-input v-model="addModel.trainNumberSource"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="stationStandSource">
-                            <span slot="label">车&emsp; 站:</span>
-                            <el-select v-model="addModel.stationStandSource" filterable placeholder="请选择">
-                                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                    :value="item.code">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="车 次 窗:" prop="trainSource">
-                            <el-input v-model="addModel.trainSource"></el-input>
-                        </el-form-item>
-                    </div>
-                </div>
-                <div
-                    style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px;">
-                    <span class="base-label">目的车次窗</span>
-                    <div style="position: relative; top:-10px;">
-                        <el-form-item label="车 组 号:" prop="trainNumberGoal">
-                            <el-input v-model="addModel.trainNumberGoal"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="stationStandGoal">
-                            <span slot="label">车&emsp; 站:</span>
-                            <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
-                                <el-option v-for="item in stationStandList" :key="item.code" :label="item.name"
-                                    :value="item.code">
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item label="车 次 窗:" prop="trainGoal">
-                            <el-input v-model="addModel.trainGoal"></el-input>
-                        </el-form-item>
-                    </div>
-                </div>
-            </div>
-        </el-form>
-        <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="640px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
+      <div style="overflow: hidden;">
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px; margin-right: 4%;"
+        >
+          <span class="base-label">源车次窗</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item label="车 组 号:" prop="trainNumberSource">
+              <el-input v-model="addModel.trainNumberSource" />
+            </el-form-item>
+            <el-form-item prop="stationStandSource">
+              <span slot="label">车&emsp; 站:</span>
+              <el-select v-model="addModel.stationStandSource" filterable placeholder="请选择">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车 次 窗:" prop="trainSource">
+              <el-input v-model="addModel.trainSource" />
+            </el-form-item>
+          </div>
+        </div>
+        <div
+          style="width: 48%; float: left; padding: 10px 15px; border: 1px double lightgray; margin: 20px 0px; height: 177px;"
+        >
+          <span class="base-label">目的车次窗</span>
+          <div style="position: relative; top:-10px;">
+            <el-form-item label="车 组 号:" prop="trainNumberGoal">
+              <el-input v-model="addModel.trainNumberGoal" />
+            </el-form-item>
+            <el-form-item prop="stationStandGoal">
+              <span slot="label">车&emsp; 站:</span>
+              <el-select v-model="addModel.stationStandGoal" filterable placeholder="请选择">
+                <el-option
+                  v-for="item in stationStandList"
+                  :key="item.code"
+                  :label="item.name"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="车 次 窗:" prop="trainGoal">
+              <el-input v-model="addModel.trainGoal" />
+            </el-form-item>
+          </div>
+        </div>
+      </div>
+    </el-form>
+    <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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-    import CancelMouseState from '@/mixin/CancelMouseState';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import CancelMouseState from '@/mixin/CancelMouseState';
 
-    export default {
-        name: 'TrainSwitch',
-        mixins: [
-            CancelMouseState
-        ],
-        data() {
-            return {
-                trainNoList: [],
-                selected: null,
-                addModel: {
-                    trainNumberSource: '',
-                    trainSource: '',
-                    stationStandSource: '',
-                    trainGoal: '',
-                    stationStandGoal: '',
-                    trainNumberGoal: '',
-                },
+export default {
+    name: 'TrainSwitch',
+    mixins: [
+        CancelMouseState
+    ],
+    data() {
+        return {
+            trainNoList: [],
+            selected: null,
+            addModel: {
+                trainNumberSource: '',
+                trainSource: '',
+                stationStandSource: '',
+                trainGoal: '',
+                stationStandGoal: '',
+                trainNumberGoal: ''
+            },
+
+            rules: {
+                trainNumberSource: [
+                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                ],
+                trainSource: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandSource: [
+                    { required: true, message: '请选择车站', trigger: 'change' }
+                ],
+                trainNumberGoal: [
+                    { required: true, message: '请输入车组号', trigger: 'blur' }
+                ],
+                trainGoal: [
+                    { required: true, message: '请输入车次号', trigger: 'blur' }
+                ],
+                stationStandGoal: [
+                    { required: true, message: '请选择车站', 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 '移动列车识别号';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            this.selected = selected;
+            // 如果不是断点激活，则需要对初始值进行初始化
+            if (!this.dialogShow) {
 
-                rules: {
-                    trainNumberSource: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                    trainSource: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandSource: [
-                        { required: true, message: '请选择车站', trigger: 'change' }
-                    ],
-                    trainNumberGoal: [
-                        { required: true, message: '请输入车组号', trigger: 'blur' }
-                    ],
-                    trainGoal: [
-                        { required: true, message: '请输入车次号', trigger: 'blur' }
-                    ],
-                    stationStandGoal: [
-                        { required: true, message: '请选择车站', 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 '移动列车识别号'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate, selected) {
-                this.selected = selected;
-                //如果不是断点激活，则需要对初始值进行初始化
-                if (!this.dialogShow) {
-
-                }
-                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);
-                this.mouseCancelState(this.selected);
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            this.mouseCancelState(this.selected);
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
 
-                            operation: OperationEvent.Train.moveTrainId.menu.operation,
-                        }
+                        operation: OperationEvent.Train.moveTrainId.menu.operation
+                    };
 
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            }
-                        }).catch(error => {
-                            this.loading = false;
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
                             this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', 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 = {
+
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', 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/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
index a2aeb20b2..90ed11999 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/setLimitSpeed.vue
@@ -1,246 +1,264 @@
 <template>
-    <el-dialog class="chengdou-03__systerm stand-stop-time" :title="title" :visible.sync="show" width="800px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <el-row>
-            <el-col :span="14">
-                <div class="card-box">
-                    <span class="tip-label">请求</span>
-                    <el-row style="margin: 5px">
-                        <el-col :span="6" class="item-label">线路选择</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="data.path">
-                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="6" class="item-label">限制速度</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="data.speed">
-                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">起始公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.begKmPost"></el-input>
-                        </el-col>
-                        <el-col :span="6" class="item-label">结束公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.endKmPost"></el-input>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">限速区段长度</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="data.length"></el-input>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>查看</el-button>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>请求</el-button>
-                        </el-col>
-                    </el-row>
-                </div>
-                <div class="card-box">
-                    <span class="tip-label">执行</span>
-                    <el-row style="margin: 5px">
-                        <el-col :span="6" class="item-label">线路选择</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="form.path">
-                                <el-option v-for="item in pathList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                        <el-col :span="6" class="item-label">限制速度</el-col>
-                        <el-col :span="6">
-                            <el-select v-model="form.speed">
-                                <el-option v-for="item in speedList" :key="item.value" :label="item.name"
-                                    :value="item.value">
-                                </el-option>
-                            </el-select>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">起始公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.begKmPost"></el-input>
-                        </el-col>
-                        <el-col :span="6" class="item-label">结束公里标</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.endKmPost"></el-input>
-                        </el-col>
-                    </el-row>
-                    <el-row>
-                        <el-col :span="6" class="item-label">限速区段长度</el-col>
-                        <el-col :span="6">
-                            <el-input v-model="form.length"></el-input>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>查看</el-button>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-button>请求</el-button>
-                        </el-col>
-                    </el-row>
-                </div>
-                <div class="card-box">
-                    <span class="tip-label">操作提示</span>
-                    11111113
-                </div>
+  <el-dialog
+    v-dialogDrag
+    class="chengdou-03__systerm stand-stop-time"
+    :title="title"
+    :visible.sync="show"
+    width="800px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="14">
+        <div class="card-box">
+          <span class="tip-label">请求</span>
+          <el-row style="margin: 5px">
+            <el-col :span="6" class="item-label">线路选择</el-col>
+            <el-col :span="6">
+              <el-select v-model="data.path">
+                <el-option
+                  v-for="item in pathList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-col>
-            <el-col :span="9" :offset="1">
-                <div class="card-box">
-                    <span class="tip-label">设备列表</span>
-                    <el-table class="card-table" :data="deviceData" border style="width: 100%" height="300">
-                        <el-table-column prop="stationName" label="站名">
-                        </el-table-column>
-                        <el-table-column prop="deviceCode" label="设备号">
-                        </el-table-column>
-                        <el-table-column prop="deviceName" label="设备名">
-                        </el-table-column>
-                    </el-table>
-                </div>
+            <el-col :span="6" class="item-label">限制速度</el-col>
+            <el-col :span="6">
+              <el-select v-model="data.speed">
+                <el-option
+                  v-for="item in speedList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
             </el-col>
-        </el-row>
-        <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-row>
+          <el-row>
+            <el-col :span="6" class="item-label">起始公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.begKmPost" />
             </el-col>
-            <el-col :span="8" :offset="4">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+            <el-col :span="6" class="item-label">结束公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.endKmPost" />
             </el-col>
-        </el-row>
-    </el-dialog>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">限速区段长度</el-col>
+            <el-col :span="6">
+              <el-input v-model="data.length" />
+            </el-col>
+            <el-col :span="3">
+              <el-button>查看</el-button>
+            </el-col>
+            <el-col :span="3">
+              <el-button>请求</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="card-box">
+          <span class="tip-label">执行</span>
+          <el-row style="margin: 5px">
+            <el-col :span="6" class="item-label">线路选择</el-col>
+            <el-col :span="6">
+              <el-select v-model="form.path">
+                <el-option
+                  v-for="item in pathList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+            <el-col :span="6" class="item-label">限制速度</el-col>
+            <el-col :span="6">
+              <el-select v-model="form.speed">
+                <el-option
+                  v-for="item in speedList"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">起始公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.begKmPost" />
+            </el-col>
+            <el-col :span="6" class="item-label">结束公里标</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.endKmPost" />
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6" class="item-label">限速区段长度</el-col>
+            <el-col :span="6">
+              <el-input v-model="form.length" />
+            </el-col>
+            <el-col :span="3">
+              <el-button>查看</el-button>
+            </el-col>
+            <el-col :span="3">
+              <el-button>请求</el-button>
+            </el-col>
+          </el-row>
+        </div>
+        <div class="card-box">
+          <span class="tip-label">操作提示</span>
+          11111113
+        </div>
+      </el-col>
+      <el-col :span="9" :offset="1">
+        <div class="card-box">
+          <span class="tip-label">设备列表</span>
+          <el-table class="card-table" :data="deviceData" border style="width: 100%" height="300">
+            <el-table-column prop="stationName" label="站名" />
+            <el-table-column prop="deviceCode" label="设备号" />
+            <el-table-column prop="deviceName" label="设备名" />
+          </el-table>
+        </div>
+      </el-col>
+    </el-row>
+    <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 { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'TrainAdd',
-        components: {
-        },
-        data() {
-            return {
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                data: {
-                    path: '',
-                    speed: '',
-                    begKmPost: '',
-                    endKmPost: '',
-                    length: '',
-                },
-                form: {
-                    path: '',
-                    speed: '',
-                    begKmPost: '',
-                    endKmPost: '',
-                    length: '',
-                },
-                pathList: [
-                    { name: '上行站线', value: '01' },
-                    { name: '下行站线', value: '02' }
-                ],
-                speedList: [
-                    { name: '10Km/h', value: '10' },
-                    { name: '15Km/h', value: '15' },
-                    { name: '20Km/h', value: '20' },
-                    { name: '25Km/h', value: '25' },
-                ],
-                deviceData: []
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'TrainAdd',
+    components: {
+    },
+    data() {
+        return {
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            data: {
+                path: '',
+                speed: '',
+                begKmPost: '',
+                endKmPost: '',
+                length: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+            form: {
+                path: '',
+                speed: '',
+                begKmPost: '',
+                endKmPost: '',
+                length: ''
             },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
-            },
-            title() {
-                return '设置临时限速'
-            }
+            pathList: [
+                { name: '上行站线', value: '01' },
+                { name: '下行站线', value: '02' }
+            ],
+            speedList: [
+                { name: '10Km/h', value: '10' },
+                { name: '15Km/h', value: '15' },
+                { name: '20Km/h', value: '20' },
+                { name: '25Km/h', value: '25' }
+            ],
+            deviceData: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                this.operate = operate || {};
-                this.operation = operate.operation;
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.planTrain.addPlanTrain.domId : '';
+        },
+        title() {
+            return '设置临时限速';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            this.operate = operate || {};
+            this.operation = operate.operation;
 
-                if (!this.dialogShow) {
-                    this.loading = false;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            send: true,
-
-                            operation: OperationEvent.Command.planTrain.addPlanTrain.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                this.doClose();
-                            } else {
-                                // this.$refs.noticeInfo.doShow(operate);
-                            }
-                        }).catch(error => {
-                            this.loading = false;
-                            this.doClose();
-                            // this.$refs.noticeInfo.doShow(operate);
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/nextNew', 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');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        send: true,
+
+                        operation: OperationEvent.Command.planTrain.addPlanTrain.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            this.doClose();
+                        } else {
+                            // this.$refs.noticeInfo.doShow(operate);
+                        }
+                    }).catch(error => {
+                        this.loading = false;
+                        this.doClose();
+                        // this.$refs.noticeInfo.doShow(operate);
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', 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/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
index b722fc115..01a8e35c0 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/stationControlConvert.vue
@@ -66,7 +66,6 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode } from '@/scripts/ConstDic';
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
@@ -114,16 +113,19 @@ export default {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.forcedStationControl);
             }
+            return '';
         },
         isRequest() {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl);
             }
+            return '';
         },
         isConter() {
             if (this.dialogShow) {
                 return OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl);
             }
+            return '';
         },
         domIdChoose() {
             if (this.dialogShow) {
@@ -135,6 +137,7 @@ export default {
                     return OperationEvent.StationControl.requestCentralControl.choose.domId;
                 }
             }
+            return '';
         },
         domIdConter() {
             return this.dialogShow ? OperationEvent.StationControl.requestCentralControl.menu.domId : '';
@@ -358,7 +361,7 @@ export default {
                 } else {
                     this.disabledSure = false;
                 }
-            }).catch((error) => {
+            }).catch(() => {
                 this.disabledSure = false;
                 this.disabledClose = false;
             });
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
index e76393b55..01e9d5f65 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuDialog/viewName.vue
@@ -159,7 +159,7 @@ export default {
             const deviceList = [];
 
             // 信号机
-            let nameShow = this.nameLevels.indexOf(1) !== -1;
+            let nameShow = this.nameLevels.includes(1);
             const signalList = this.$store.getters['map/signalList'];
             if (signalList && signalList.length > 0) {
                 signalList.forEach(elem => {
@@ -168,11 +168,11 @@ export default {
             }
 
             // 按钮名称
-            nameShow = this.nameLevels.indexOf(3) !== -1;
+            nameShow = this.nameLevels.includes(3);
 
             // 道岔
-            nameShow = this.nameLevels.indexOf(7) !== -1; // 道岔名称
-            const switchSectionNameShow = this.nameLevels.indexOf(9) !== -1; // 道岔轨名称
+            nameShow = this.nameLevels.includes(7); // 道岔名称
+            const switchSectionNameShow = this.nameLevels.includes(9); // 道岔轨名称
             const switchList = this.$store.getters['map/switchList'];
             if (switchList && switchList.length > 0) {
                 switchList.forEach(elem => {
@@ -181,7 +181,7 @@ export default {
             }
 
             // 控制模式
-            const indicatorShow = this.nameLevels.indexOf(8) !== -1;
+            const indicatorShow = this.nameLevels.includes(8);
             const control = this.$store.getters['map/stationControlList'];
             if (control && control.length > 0) {
                 control.forEach(elem => {
@@ -204,28 +204,28 @@ export default {
                         nameShow = false;
                     } else if (elem.type === '01') {
                         // 计轴区段名称
-                        nameShow = this.nameLevels.indexOf(11) !== -1;
+                        nameShow = this.nameLevels.includes(11);
                     } else if (elem.type === '02') {
                         // 轨道轨名称
-                        nameShow = this.nameLevels.indexOf(5) !== -1;
+                        nameShow = this.nameLevels.includes(5);
                     } else if (elem.type === '04') {
                         // 道岔区段名称
-                        nameShow = this.nameLevels.indexOf(9) !== -1;
+                        nameShow = this.nameLevels.includes(9);
                     }
 
                     // 站台轨名称
                     if (elem.standTrack) {
-                        standTrackNameShow = this.nameLevels.indexOf(2) !== -1;
+                        standTrackNameShow = this.nameLevels.includes(2);
                     }
 
                     // 折返轨名称
                     if (elem.reentryTrack) {
-                        reentryTrackNameShow = this.nameLevels.indexOf(4) !== -1;
+                        reentryTrackNameShow = this.nameLevels.includes(4);
                     }
 
                     // 转换轨名称
                     if (elem.transferTrack) {
-                        transferTrackNameShow = this.nameLevels.indexOf(6) !== -1;
+                        transferTrackNameShow = this.nameLevels.includes(6);
                     }
 
                     deviceList.push(Object.assign(this.$jlmap.getDeviceByCode(elem.code), { nameShow, standTrackNameShow, reentryTrackNameShow, transferTrackNameShow }));
@@ -233,7 +233,7 @@ export default {
             }
 
             // 停车点
-            const destCodeShow = this.nameLevels.indexOf(10) !== -1;
+            const destCodeShow = this.nameLevels.includes(10);
             const stopPointList = this.$store.getters['map/stopPointList'];
             if (stopPointList && stopPointList.length > 0) {
                 stopPointList.forEach(elem => {
@@ -242,7 +242,7 @@ export default {
             }
 
             // 车站
-            const kmPostShow = this.nameLevels.indexOf(12) !== -1;
+            const kmPostShow = this.nameLevels.includes(12);
             const stationList = this.$store.getters['map/stationList'];
             if (stationList && stationList.length > 0) {
                 stationList.forEach(elem => {
diff --git a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
index 4048cba5d..95bc382b2 100644
--- a/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
+++ b/src/jmapNew/theme/chengdu_03/menus/menuTool.vue
@@ -19,9 +19,6 @@
   </div>
 </template>
 <script>
-// import { mapGetters } from 'vuex';
-// import { TrainingMode, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
-// import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler'
 import { prefixIntrger } from '@/utils/date';
 import SystemTime from '@/views/components/systemTime/index';
 import logo_ from '@/assets/logo_.png';
diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
index 3e25ce346..6c0a03e6a 100644
--- a/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/confirmControl.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from './noticeInfo';
 import { commitOperate } from '../../utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
diff --git a/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue b/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue
index ad4955cee..598ebf016 100644
--- a/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/confirmTip.vue
@@ -27,7 +27,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
 export default {
     name: 'ConfirmTip',
diff --git a/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue b/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
index 932cbeeab..862a78861 100644
--- a/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/noticeInfo.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'NoticeInfo',
diff --git a/src/jmapNew/theme/components/menus/childDialog/selectStation.vue b/src/jmapNew/theme/components/menus/childDialog/selectStation.vue
index f1058c80a..e011de5db 100644
--- a/src/jmapNew/theme/components/menus/childDialog/selectStation.vue
+++ b/src/jmapNew/theme/components/menus/childDialog/selectStation.vue
@@ -28,7 +28,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
 
 export default {
     name: '',
diff --git a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
index 023eb0928..ec4152681 100644
--- a/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/components/menus/dialog/cancelAllLimit.vue
@@ -82,7 +82,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmTip from '../childDialog/confirmTip';
 import { menuOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 
diff --git a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
index 825d9aa77..bf447c8d7 100644
--- a/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
@@ -289,7 +289,7 @@ export default {
                     operate.operation = OperationEvent.Signal.atsAutoControl.choose.operation;
                 }
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
diff --git a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
index fe6398a80..6589857a2 100644
--- a/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
+++ b/src/jmapNew/theme/components/menus/dialog/setTrainOperation.vue
@@ -13,22 +13,23 @@
       </div>
       <div class="el-dialog__body">
         <el-row>
-          <el-form ref="form" :model="formModel" :rules="rules">
+          <el-form ref="form" :model="formModel" :rules="rules" label-width="80px">
             <el-col :span="24">
-              <el-form-item prop="groupNumber1" label="主动车:">
-                <el-select v-model="formModel.groupNumber1" size="small" style="width: 165px;height: 32px;line-height: 32px;" placeholder="请选择">
+              <el-form-item prop="groupNumber" label="主动车:">
+                <el-input v-model="formModel.groupNumber" size="small" style="width: 165px;height: 32px;line-height: 32px;" disabled />
+                <!-- <el-select v-model="formModel.groupNumber" size="small" style="width: 165px;height: 32px;line-height: 32px;" placeholder="请选择">
                   <el-option
                     v-for="item in selectedList"
                     :key="item.code"
                     :label="item.name"
                     :value="item.code"
                   />
-                </el-select>
-                <el-button
+                </el-select> -->
+                <!-- <el-button
                   :type="field == 'selectedCode1' ? 'danger' : 'primary'"
                   size="small"
                   @click="hover('selectedCode1')"
-                >激活</el-button>
+                >激活</el-button> -->
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -87,14 +88,14 @@ export default {
             loading: false,
             operation: '',
             formModel: {
-                groupNumber1: '',
+                groupNumber: '',
                 groupNumber2: ''
             },
             groupNumber: '',
             field: '',
             rules: {
-                faultType: [
-                    { required: true, message: '请选择故障类型', trigger: 'change'}
+                groupNumber2: [
+                    { required: true, message: '请选择被动车', trigger: 'change'}
                 ]
             }
         };
@@ -154,6 +155,7 @@ export default {
                 this.cmdType = operate.cmdType;
             }
             if (selected._type) {
+                this.formModel.groupNumber = selected.groupNumber;
                 this.dialogShow = true;
                 this.$nextTick(function () {
                     this.$store.dispatch('training/emitTipFresh');
@@ -181,7 +183,7 @@ export default {
                 operation: menuOperate.Common.setLink.operation,
                 cmdType: menuOperate.Common.setLink.cmdType,
                 param: {
-                    groupNumber1: this.formModel.groupNumber1,
+                    groupNumber: this.formModel.groupNumber,
                     groupNumber2: this.formModel.groupNumber2
                 }
             };
@@ -196,12 +198,12 @@ export default {
                     this.doClose();
                 } else {
                     this.doClose();
-                    this.$messageBox('设置或取消故障操作失败！');
+                    this.$messageBox('设置连挂失败！');
                 }
             }).catch((error) => {
                 this.loading = false;
                 this.doClose();
-                this.$messageBox(error.message || '设置或取消故障操作失败！');
+                this.$messageBox(error.message || '设置连挂失败！');
             });
         },
 
@@ -219,10 +221,11 @@ export default {
             });
         },
         deviceSelect(em) {
-            if (this.field == 'selectedCode1' && em._type == 'Train') {
-                this.formModel.groupNumber1 = em.code;
-                this.field = '';
-            } else if (this.field == 'selectedCode2' && em._type == 'Train') {
+            // if (this.field == 'selectedCode1' && em._type == 'Train') {
+            //     this.formModel.groupNumber1 = em.code;
+            //     this.field = '';
+            // } else
+            if (this.field == 'selectedCode2' && em._type == 'Train') {
                 this.formModel.groupNumber2 = em.code;
                 this.field = '';
             }
diff --git a/src/jmapNew/theme/components/menus/dialog/standControl.vue b/src/jmapNew/theme/components/menus/dialog/standControl.vue
index fadbe1b95..1c3f9a26c 100644
--- a/src/jmapNew/theme/components/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/components/menus/dialog/standControl.vue
@@ -289,7 +289,7 @@ export default {
                 operate.operation = OperationEvent.StationStand.earlyDeparture.downSelect.operation;
             }
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
diff --git a/src/jmapNew/theme/components/menus/passiveDialog/control.vue b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
index e71e83129..25321ff47 100644
--- a/src/jmapNew/theme/components/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/components/menus/passiveDialog/control.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-import {OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {SimulationType} from '@/scripts/ConstDic';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import NoticeInfo from '../childDialog/noticeInfo';
@@ -268,7 +268,7 @@ export default {
                     val: this.serializeCodeListWithSeparator('::')
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
index d5a30337e..102917e3b 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/allLineCancelLimit.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
index d7aa93a74..211aab457 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/cancelAllLimit.vue
@@ -82,7 +82,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmTip from './childDialog/confirmTip';
 
 export default {
@@ -172,7 +173,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = true;
@@ -187,7 +188,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = false;
@@ -208,7 +209,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -228,7 +229,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -246,7 +247,7 @@ export default {
                 type: MapDeviceType.LimitControl.type,
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (!this.isOpenMessage) {
                     this.doClose();
@@ -267,7 +268,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.ConfirmTip.doClose();
                 this.isOpenMessage = false;
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue
index 15649236f..7c1208284 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmControl.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 4f3a929f7..d34387819 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -87,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -106,7 +107,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue b/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
index ae31fb36a..b9071cbfe 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/routeSelection.vue
@@ -20,9 +20,9 @@
       <el-table-column :id="domIdChoose" prop="name" label="进路" style="margin-left:30px;" width="150px" />
       <el-table-column prop="settable" label="状态" style="margin-left:30px;" width="100px">
         <!--<template slot-scope="scope">-->
-          <!--<span>{{ scope.row.settable == 1? '允许选排':'不能选排' }}</span>-->
-          <span>允许选排</span>
+        <!--<span>{{ scope.row.settable == 1? '允许选排':'不能选排' }}</span>-->
         <!--</template>-->
+        <span>允许选排</span>
       </el-table-column>
       <el-table-column style="margin-left:30px;" />
     </el-table>
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
index a560f093b..d711518d9 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/standBackStrategy.vue
@@ -50,7 +50,8 @@
 <script>
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -159,7 +160,7 @@ export default {
             };
             this.strategy = row.value;
             this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -196,7 +197,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -216,7 +217,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue
index 6e00bec97..687a5e503 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationCmdControl.vue
@@ -77,7 +77,8 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
 
 export default {
@@ -256,7 +257,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -283,7 +284,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -313,7 +314,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -344,7 +345,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -362,7 +363,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue
index a70136e34..b51583487 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationHumanControlAll.vue
@@ -27,7 +27,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -90,7 +91,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -107,7 +108,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue
index 350792e92..8379dad84 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/stationSetRouteControlAll.vue
@@ -39,7 +39,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -109,7 +110,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -126,7 +127,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue
index 26eacc475..42ed6acb0 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDefine.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -123,7 +124,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -138,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue
index 3c1078bf9..7256759d2 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDelete.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -119,7 +120,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -136,7 +137,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -157,7 +158,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
index b7fa3c00f..a99bd0fac 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainDeletePlan.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',
@@ -119,7 +120,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -139,7 +140,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue
index d30bed3f2..909a1c0ed 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainEdit.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -123,7 +124,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -138,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue
index a96b0084c..32c518d2e 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainFlag.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -117,7 +118,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -134,7 +135,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue
index 898656a13..751f16ba0 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainMove.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -123,7 +124,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -138,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
index 298a52e65..662601064 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainMoveEvently.vue
@@ -49,7 +49,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainMove',
@@ -131,7 +132,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -151,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue
index ceb360edd..e9d601cab 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetHead.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -123,7 +124,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -138,7 +139,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -155,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue
index 30e770e15..4298e0046 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetPlan.vue
@@ -45,7 +45,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -116,7 +117,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -131,7 +132,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -148,7 +149,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue
index e940421df..8919cfdeb 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWork.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -107,7 +108,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -122,7 +123,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -139,7 +140,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue
index fd96a1ad3..84a2315dd 100644
--- a/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/foshan_01/menus/dialog/trainSetWorkATP.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -118,7 +119,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -133,7 +134,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuBar.vue b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
index 3fb95120d..7914f5e85 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuBar.vue
@@ -100,8 +100,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
-// import { menuBarConvert, SystemType } from './utils/menuItemStatus';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
index f15ed83f7..835633ca4 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/twoConfirmation.vue
@@ -30,7 +30,8 @@
 </template>
 
 <script>
-import { OperationEvent, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
+import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
@@ -53,11 +54,11 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         domIdConfirm() {
-            if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.emergencyStationControl)) {
+            if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.emergencyStationControl)) {
                 return OperationEvent.StationControl.emergencyStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestStationControl)) {
                 return OperationEvent.StationControl.requestStationControl.confirm.domId;
-            } else if (checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
+            } else if (OperationHandler.checkOperationIsCurrentOperate(this.operation, OperationEvent.StationControl.requestCentralControl)) {
                 return OperationEvent.StationControl.requestCentralControl.confirm.domId;
             }
             return '';
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
index a12c36132..d57bcba04 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userAdd.vue
@@ -41,7 +41,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserAdd',
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
index 48214bdea..6376a67e1 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userDelete.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserDelete',
@@ -106,7 +106,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -123,7 +123,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
index a15787167..fc72a195a 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/childDialog/userEdit.vue
@@ -44,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserEdit',
@@ -142,7 +142,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
index 1d46b973c..46c991426 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorl.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
index 1da823774..eadc43e90 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -120,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -148,7 +149,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -172,7 +173,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
index cfc5649b7..ee9750565 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/helpAbout.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
@@ -104,7 +104,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -120,7 +120,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
index 5cc106fe3..1a17e95f1 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/manageUser.vue
@@ -70,7 +70,7 @@ import { mapGetters } from 'vuex';
 import UserAdd from './childDialog/userAdd';
 import UserEdit from './childDialog/userEdit';
 import UserDelete from './childDialog/userDelete';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
@@ -153,7 +153,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -171,7 +171,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -193,7 +193,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -213,7 +213,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -227,7 +227,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -241,7 +241,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -257,7 +257,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
index fec6ae761..895aa86de 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue
@@ -48,7 +48,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import TwoConfirmation from './childDialog/twoConfirmation';
 
 export default {
@@ -188,7 +188,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
index baa742dfd..85ed13b31 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainAdd.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
index 12a9b2683..9320a229a 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainDelete.vue
@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -113,7 +114,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -133,7 +134,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
index 92f5df32c..0d3a1e182 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/foshan_01/menus/menuLimit.vue b/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
index c1e1b60d1..c84d1d3ab 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuLimit.vue
@@ -10,7 +10,9 @@ import PopMenu from '@/components/PopMenu';
 import CancelAllLimit from './dialog/cancelAllLimit';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'MenuLimit',
@@ -107,7 +109,7 @@ export default {
                 label: MapDeviceType.LimitControl.label,
                 operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.cancelAllLimit.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/foshan_01/menus/menuStation.vue b/src/jmapNew/theme/foshan_01/menus/menuStation.vue
index d952521e2..7c94b6988 100644
--- a/src/jmapNew/theme/foshan_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/foshan_01/menus/menuStation.vue
@@ -18,7 +18,9 @@ import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo'
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
@@ -167,7 +169,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.setAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -185,7 +187,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -202,7 +204,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.powerUnLock.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -218,7 +220,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.execKeyOperationTest.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationCmdControl.doShow(operate, this.selected);
@@ -234,7 +236,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.humanControlALL.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationHumanControlAll.doShow(operate, this.selected);
@@ -250,7 +252,7 @@ export default {
                 label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.stationSetRouteControlAll.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.stationSetRouteControlAll.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue
index dd1b085ae..ea8bed579 100644
--- a/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/foshan_01/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
index 7352088ca..9508511ed 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/childDialog/confirmTrain.vue
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -160,7 +160,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
index 2233a4a91..3291b31a3 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standBackStrategy.vue
@@ -242,7 +242,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
index c26e4e4b3..9aca42f86 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/standDetail.vue
@@ -166,7 +166,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
index b8f443e2b..183f7230f 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainCreate.vue
@@ -125,7 +125,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -142,7 +142,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
index e410bfb94..db250f2cc 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainDelete.vue
@@ -117,7 +117,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
index fe924739b..1ae329ee9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainEditNumber.vue
@@ -91,13 +91,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.editTrainNo.menu.operation,
                         cmdType: CMD.Train.CMD_EDIT_TRAIN_NO
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -113,11 +113,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
index 845e76b56..4a66c7d0e 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainMove.vue
@@ -153,13 +153,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.moveTrainId.menu.operation,
                         cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -176,11 +176,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
index c7cb6d580..b6780715b 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/dialog/trainSwitch.vue
@@ -158,13 +158,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.moveTrainId.menu.operation,
                         cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -181,11 +181,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
index d2467898d..efffdd6eb 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userAdd.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
index f0fb7cdc1..c5d687e91 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userDelete.vue
@@ -105,7 +105,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
index a39351cd4..deb7d4f8c 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/childDialog/userEdit.vue
@@ -142,7 +142,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
index 688174504..ea02b067f 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/helpAbout.vue
@@ -103,7 +103,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -119,7 +119,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
index 996630adf..4700b6c16 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/manageUser.vue
@@ -153,7 +153,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -171,7 +171,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -193,7 +193,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -213,7 +213,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -227,7 +227,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -241,7 +241,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -257,7 +257,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
index ff0d45266..d52cac9f9 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/passwordBox.vue
@@ -128,7 +128,7 @@ export default {
                 operation: OperationEvent.Command.close.password.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
index 89055de36..74862eb5d 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainAdd.vue
@@ -126,12 +126,12 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Command.planTrain.addPlanTrain.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,11 +150,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
index 7e947d735..ba359f150 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainDelete.vue
@@ -108,12 +108,12 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Command.planTrain.delPlanTrain.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -132,11 +132,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
index 60da613b0..849ed6502 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/trainTranstalet.vue
@@ -125,12 +125,12 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Command.planTrain.translatPlanTrain.operation
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -149,11 +149,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
index c7faeeeca..3df131035 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewDevice.vue
@@ -97,7 +97,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -112,7 +112,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
index 13f37704f..4f5a03f5a 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewName.vue
@@ -131,7 +131,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -146,7 +146,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
index 372a2e9c1..f27437ed7 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuDialog/viewTrainId.vue
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -154,7 +154,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.setTrainDispaly();
diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
index d97034f1e..2e74d386f 100644
--- a/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/fuzhou_01/menus/menuTrain.vue
@@ -275,7 +275,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -295,7 +295,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainControl.doShow(step, this.selected);
@@ -312,7 +312,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainDelete.doShow(step, this.selected);
@@ -345,7 +345,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -362,7 +362,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainMove.doShow(step, this.selected);
@@ -379,7 +379,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.trainSwitch.doShow(step, this.selected);
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue
index 985217121..27c0e321c 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/childDialog/confirmTrain.vue
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -160,7 +160,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue
index 8f8947ed4..874b23dbf 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeDetail.vue
@@ -136,7 +136,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -153,7 +153,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue
index 96abcdd59..4c99bf3c3 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/routeLock.vue
@@ -154,7 +154,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue
index 7512d635c..5fdf163a2 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standBackStrategy.vue
@@ -197,7 +197,7 @@ export default {
             this.strategy = strategy;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -220,7 +220,7 @@ export default {
                     }
                 };
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -240,7 +240,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue
index 54b6672a7..15fd87aa6 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standControl.vue
@@ -131,7 +131,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -152,7 +152,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -173,7 +173,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 this.doClose();
                 if (!valid) {
@@ -194,7 +194,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -215,7 +215,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -236,7 +236,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -253,7 +253,7 @@ export default {
             };
 
             this.loading = false;
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue
index d2dd8504b..efc518b1f 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetail.vue
@@ -152,7 +152,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -167,7 +167,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue
index 4f475f585..9493fb236 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standDetainTrainAll.vue
@@ -145,7 +145,7 @@ export default {
                 val: `${upDown}`
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -163,7 +163,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue
index ea3fc129b..d1ce49db9 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standRunLevel.vue
@@ -203,7 +203,7 @@ export default {
             this.time = time;
             this.isSelect = false;
             this.isConfirm = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -218,7 +218,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -243,7 +243,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -263,7 +263,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue
index 94ae1608c..53d0b1b03 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/standStopTime.vue
@@ -187,7 +187,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -202,7 +202,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -218,7 +218,7 @@ export default {
                 }
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -237,7 +237,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -254,7 +254,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue
index 4e229f2b9..e3164076b 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationCmdControl.vue
@@ -265,7 +265,7 @@ export default {
 
             this.setMessage(this.$t('tip.firstConfirmTip'));
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -291,7 +291,7 @@ export default {
 
             this.setMessage(this.$t('tip.secondConfirmTip'));
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -322,7 +322,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -352,7 +352,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -369,7 +369,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue
index aabc4618c..a33ef3e1f 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationHumanControlAll.vue
@@ -87,7 +87,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -103,7 +103,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue
index 52d022ac7..9813f6121 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/stationSetRouteControlAll.vue
@@ -109,7 +109,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -125,7 +125,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue
index d2a30e864..8fd361da4 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/switchCmdControl.vue
@@ -321,7 +321,7 @@ export default {
 
             this.setMessage(this.$t('tip.firstConfirmTip'));
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickReleaseCommand'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -354,7 +354,7 @@ export default {
 
             this.setMessage(this.$t('tip.secondConfirmTip'));
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickFirstConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -392,7 +392,7 @@ export default {
             }
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSecondConfirm'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -428,7 +428,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: this.$t('menu.clickSuspend'), result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -445,7 +445,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
index c589f8f15..5a2eacac4 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainControl.vue
@@ -316,7 +316,7 @@ export default {
                 operate.operation = OperationEvent.Train.editTrainId.trainNumberChange.operation;
             }
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -335,7 +335,7 @@ export default {
                 operate.operation = OperationEvent.Train.editTrainId.trainTypeChange.operation;
             }
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -357,7 +357,7 @@ export default {
                 operate.cmdType = CMD.Train.editTrainId;
             }
             Handler.undo(1);
-            this.$store.dispatch('training/next', operate).then(({ valid, response }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {
                 if (valid) {
                     if (response.data) {
                         this.formModel = {
@@ -406,7 +406,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -437,7 +437,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -460,7 +460,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
index 0b768389f..a6036837e 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainCreate.vue
@@ -125,7 +125,7 @@ export default {
                 val: '' + this.direction + '::' + this.trainCode
             };
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -142,7 +142,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue
index 8a9246df4..80ac1a0e8 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainDelete.vue
@@ -117,7 +117,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue
index 499572553..8307b4383 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainEditNumber.vue
@@ -91,13 +91,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.editTrainNo.menu.operation,
                         cmdType: CMD.Train.CMD_EDIT_TRAIN_NO
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -113,11 +113,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue
index 0c159ce9f..75792d228 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainMove.vue
@@ -153,13 +153,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.moveTrainId.menu.operation,
                         cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -176,11 +176,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue
index bf2e7d99d..efbfedc5b 100644
--- a/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/dialog/trainSwitch.vue
@@ -158,13 +158,13 @@ export default {
                 if (valid) {
                     const operate = {
                         send: true,
-                        
+
                         operation: OperationEvent.Train.moveTrainId.menu.operation,
                         cmdType: CMD.Train.CMD_MOVE_TRAIN_ID
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -181,11 +181,11 @@ export default {
         },
         cancel() {
             const operate = {
-                
+
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
index 435816907..ecb63b75a 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
@@ -30,7 +30,7 @@
           </el-col>
         </el-row>
       </div>
-      <div style="position: relative;height: 20px;line-height: 20px;top: -120px;text-align: left;right: -80px;background: #F0F0F0;width: 88px;">筛选条件查询</div>
+      <div style="position: relative;height: 20px;line-height: 20px;top: -76px;text-align: left;right: -80px;background: #F0F0F0;width: 88px;">筛选条件查询</div>
       <el-row>
         <el-col :span="8">
           <el-button @click="infoConfirm">消息确认</el-button>
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
index 1fe379a89..9a7181b8f 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuTrain.vue
@@ -185,7 +185,7 @@ export default {
                     code: this.selected.code
                 }
             };
-            this.$store.dispatch('training/next', step).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -256,7 +256,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainControl.doShow(step, this.selected);
@@ -273,7 +273,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainDelete.doShow(step, this.selected);
@@ -290,7 +290,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainControl.doShow(step, this.selected);
@@ -307,7 +307,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainEditNumber.doShow(step, this.selected);
@@ -324,7 +324,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainMove.doShow(step, this.selected);
@@ -341,7 +341,7 @@ export default {
         //             code: this.selected.code
         //         }
         //     };
-        //     this.$store.dispatch('training/next', step).then(({ valid }) => {
+        //     this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
         //         if (valid) {
         //             this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
         //             this.$refs.trainSwitch.doShow(step, this.selected);
diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue
index 7dfce1315..03317eb1e 100644
--- a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/alarm.vue
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -190,7 +190,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue
index 48e549e58..7b52fc5c5 100644
--- a/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/passiveDialog/timeout.vue
@@ -84,7 +84,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -95,7 +95,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
index 6666d8f79..988001ee4 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmControl.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 378e19ce1..fb688667c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -87,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -106,7 +107,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
index 5e3ed5a50..ac336943f 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
@@ -26,8 +26,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
 export default {
     name: 'ConfirmTip',
     data() {
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
index da0642ed6..3cccf18f2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDefine.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
index 6230af224..ecf90c087 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainDelete.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -120,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +138,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -158,7 +159,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
index 65be435f4..9835510ec 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainMove.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
index ba5b78c2f..91cb09afe 100644
--- a/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/trainSetWorkATP.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -119,7 +120,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +135,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
index 2f982d957..c90624d31 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
@@ -99,7 +99,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
index eac2e8cea..c31ff3b66 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userAdd.vue
@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -159,4 +169,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
index 243fe7ec2..e62e5d148 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userDelete.vue
@@ -1,126 +1,136 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding-left: 10px; padding-bottom: 10px">
-            <i class="el-icon-info"></i>
-            <template v-for="(message, index) in messages">
-                <span :key="index">{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="3">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserDelete',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                messages: [],
-                model: {
-                    type: 'DELETE',
-                    jobNumber: '',
-                    userName: '',
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.messages = operate.messages;
-                    this.model.userName = '';
-                    this.model.jobNumber = '';
-                    if (selected) {
-                        this.model.userName = selected.userName;
-                        this.model.jobNumber = selected.jobNumber;
-                    }
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '删除用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.model.userName && this.model.jobNumber) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            cancel() {
-                let operate = {
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
                     if (valid) {
                         this.doClose();
+                        this.$emit('operateUser', this.model);
                     }
-                }).catch(error => { this.doClose(); });
+                });
+            } else {
+                this.$messageBox('选择的用户名或工号为空');
             }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -131,4 +141,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
index 33d38059f..2bb23568a 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/userEdit.vue
@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -175,4 +186,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
index d3b7c130e..7bbd277fb 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -135,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue
index d3f0835a1..c92441f6b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -131,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -159,7 +160,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -183,7 +184,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
index 0348a0cd8..9f6c97add 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/helpAbout.vue
@@ -1,123 +1,133 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="height: 70px;">
-            <div style="position: relative; left: 10px;">
-            </div>
-            <div style="position: relative; left: 80px;">
-                <div style="width:100%">
-                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
-                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
-                        :loading="loading" @click="commit">确定</el-button>
-                </div>
-                <div style="width:100%; padding-top: 20px">
-                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
-                </div>
-            </div>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >确定</el-button>
         </div>
-        <div style="padding: 10px;  margin: 5px; ">
-            <el-table :data="tableData" style="width: 100%;" height="400">
-                <el-table-column prop="moduleName" label="模块名称" width="180">
-                </el-table-column>
-                <el-table-column prop="version" label="版本" width="180">
-                </el-table-column>
-                <el-table-column prop="updateDate" label="修改日期">
-                </el-table-column>
-            </el-table>
+        <div style="width:100%; padding-top: 20px">
+          <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
         </div>
-    </el-dialog>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" label="模块名称" width="180" />
+        <el-table-column prop="version" label="版本" width="180" />
+        <el-table-column prop="updateDate" label="修改日期" />
+      </el-table>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        data() {
-            return {
-                tableData: [
-                    {
-                        moduleName: '主程序版本:',
-                        version: '123',
-                        updateDate: '123'
-                    }
-                ],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '关于ControlMonitor'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: '主程序版本:',
+                    version: '123',
+                    updateDate: '123'
                 }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '关于ControlMonitor';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.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();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+                this.operate = operate || {};
+                this.operation = operate.operation;
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -128,4 +138,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
index 6c22ac606..688ea98e2 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/manageUser.vue
@@ -1,282 +1,300 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-            <span class="base-label">用户列表</span>
-            <el-row>
-                <el-col :span="18">
-                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
-                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
-                        <el-table-column prop="jobNumber" label="工号" width="120">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.jobNumber}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userName" label="用户名">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.userName}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column width="20">
-                        </el-table-column>
-                    </el-table>
-                </el-col>
-                <el-col :span="4">
-                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
-        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
-        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">用户列表</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" label="工号" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" label="用户名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">刷新
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">增加
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">修改
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">删除
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import UserAdd from './childDialog/userAdd';
-    import UserEdit from './childDialog/userEdit';
-    import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        components: {
-            UserAdd,
-            UserEdit,
-            UserDelete
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                tableData: [],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdAddUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-            },
-            domIdEditUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-            },
-            domIdDelUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-            },
-            domIdFreshUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-            },
-            domIdChooseUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '用户管理'
-            }
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '用户管理';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.addUser.operation,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
                 }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.$refs.userAdd.doShow(operate);
+                        this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
-                })
-            },
-            //编辑用户
-            editUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.editUser.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userEdit.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //删除用户
-            delUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.delUser.operation,
-                        messages: [`你确定删除用户${this.selected.userName}吗？`]
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userDelete.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //刷新用户
-            freshUser() {
-                let operate = {
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.manage.freshUser.operation,
-                }
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`你确定删除用户${this.selected.userName}吗？`]
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            //选择用户
-            chooseUser(row) {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.chooseUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.selected = row;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.doClose();
+                        this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            },
-            //增删改函数处理
-            operateUser(data) {
-                if (data && data.type === 'ADD') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index < 0) {
-                        this.tableData.push({
-                            jobNumber: data.jobNumber,
-                            userName: data.userName,
-                            password: data.password
-                        });
-                    } else {
-                        this.$messageBox('添加失败，存在相同工号的用户');
-                    }
-                } else if (data && data.type === 'EDIT') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData[index].password = data.password;
-                        this.tableData[index].userName = data.userName;
-                    } else {
-                        this.$messageBox('修改失败');
-                    }
-                } else if (data && data.type === 'DELETE') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData.splice(index, 1);
-                    } else {
-                        this.$messageBox('删除失败');
-                    }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox('添加失败，存在相同工号的用户');
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox('修改失败');
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                } else {
+                    this.$messageBox('删除失败');
                 }
             }
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -287,4 +305,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
index ae759a395..a3778e533 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainAdd.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
index 5eaa74ee4..c2250ed4b 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainDelete.vue
@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -113,7 +114,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -133,7 +134,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
index 133de1d96..813c752ac 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
index 2e98c6476..46df0698c 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
index 40a2936a9..e128fd830 100644
--- a/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
@@ -86,7 +86,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -98,7 +98,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
index 6666d8f79..988001ee4 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
index 378e19ce1..fb688667c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -87,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -106,7 +107,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmTip.vue
index 5e3ed5a50..ac336943f 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmTip.vue
@@ -26,8 +26,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
 export default {
     name: 'ConfirmTip',
     data() {
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
index da0642ed6..3cccf18f2 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
index 6230af224..ecf90c087 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -120,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +138,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -158,7 +159,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
index 65be435f4..9835510ec 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
index ba5b78c2f..91cb09afe 100644
--- a/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -119,7 +120,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +135,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue
index eac2e8cea..c31ff3b66 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userAdd.vue
@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -159,4 +169,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue
index 243fe7ec2..e62e5d148 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userDelete.vue
@@ -1,126 +1,136 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding-left: 10px; padding-bottom: 10px">
-            <i class="el-icon-info"></i>
-            <template v-for="(message, index) in messages">
-                <span :key="index">{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="3">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserDelete',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                messages: [],
-                model: {
-                    type: 'DELETE',
-                    jobNumber: '',
-                    userName: '',
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.messages = operate.messages;
-                    this.model.userName = '';
-                    this.model.jobNumber = '';
-                    if (selected) {
-                        this.model.userName = selected.userName;
-                        this.model.jobNumber = selected.jobNumber;
-                    }
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '删除用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.model.userName && this.model.jobNumber) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            cancel() {
-                let operate = {
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
                     if (valid) {
                         this.doClose();
+                        this.$emit('operateUser', this.model);
                     }
-                }).catch(error => { this.doClose(); });
+                });
+            } else {
+                this.$messageBox('选择的用户名或工号为空');
             }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -131,4 +141,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue
index 33d38059f..2bb23568a 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/childDialog/userEdit.vue
@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -175,4 +186,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
index 133de1d96..813c752ac 100644
--- a/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
index 2e98c6476..46df0698c 100644
--- a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
index 40a2936a9..e128fd830 100644
--- a/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
@@ -86,7 +86,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -98,7 +98,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
index 6666d8f79..988001ee4 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
index 378e19ce1..fb688667c 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -87,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -106,7 +107,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue
index 5e3ed5a50..ac336943f 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmTip.vue
@@ -26,8 +26,6 @@
 </template>
 
 <script>
-// import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-
 export default {
     name: 'ConfirmTip',
     data() {
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
index da0642ed6..3cccf18f2 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
index 6230af224..ecf90c087 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
@@ -30,7 +30,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 // import { getPublishMapTrainNos } from '@/api/runplan';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
@@ -120,7 +121,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -137,7 +138,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -158,7 +159,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
index 65be435f4..9835510ec 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
@@ -44,7 +44,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -124,7 +125,7 @@ export default {
                 val: this.addModel.groupNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -139,7 +140,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -156,7 +157,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
index ba5b78c2f..91cb09afe 100644
--- a/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
+++ b/src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
@@ -40,7 +40,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
 
@@ -119,7 +120,7 @@ export default {
                 val: this.addModel.tripNumber
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -134,7 +135,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -151,7 +152,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuBar.vue b/src/jmapNew/theme/race_01/menus/menuBar.vue
index 2f982d957..c90624d31 100644
--- a/src/jmapNew/theme/race_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/race_01/menus/menuBar.vue
@@ -99,7 +99,8 @@
 </template>
 <script>
 import { mapGetters } from 'vuex';
-import { TrainingMode, OperationEvent } from '@/scripts/ConstDic';
+import { TrainingMode } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import StationControl from './menuDialog/stationControl';
 import DetainTrainContorl from './menuDialog/detainTrainContorl';
 import DetainTrainContorlUpDown from './menuDialog/detainTrainContorlUpDown';
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
index eac2e8cea..c31ff3b66 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
@@ -1,154 +1,164 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-add" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber"></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-add"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserAdd',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'ADD',
-                    jobNumber: '',
-                    userName: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserAdd',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'ADD',
+                jobNumber: '',
+                userName: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                password: [
+                    { required: true, message: '请输入密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '增加用户'
-            }
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                    });
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        title() {
+            return '增加用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid) {
-                                if (this.model.password === this.model.confirm) {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                } else {
-                                    this.$messageBox('二次输入密码不一致');
-                                }
-                            }
-                        })
-                    } else {
-                        return false;
-                    }
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
                 });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); this.model });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.model.password === this.model.confirm) {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            } else {
+                                this.$messageBox('二次输入密码不一致');
+                            }
+                        }
+                    });
+                } else {
+                    return false;
+                }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -159,4 +169,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
index 243fe7ec2..e62e5d148 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
@@ -1,126 +1,136 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-delete" :title="title" :visible.sync="show" width="260px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding-left: 10px; padding-bottom: 10px">
-            <i class="el-icon-info"></i>
-            <template v-for="(message, index) in messages">
-                <span :key="index">{{message}}</span>
-            </template>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="3">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="2">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-delete"
+    :title="title"
+    :visible.sync="show"
+    width="260px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding-left: 10px; padding-bottom: 10px">
+      <i class="el-icon-info" />
+      <template v-for="(message, index) in messages">
+        <span :key="index">{{ message }}</span>
+      </template>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="3">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="2">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserDelete',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                messages: [],
-                model: {
-                    type: 'DELETE',
-                    jobNumber: '',
-                    userName: '',
-                },
-                operation: null,
-                dialogShow: false,
-                loading: false,
-            }
-        },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
+export default {
+    name: 'UserDelete',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            messages: [],
+            model: {
+                type: 'DELETE',
+                jobNumber: '',
+                userName: ''
             },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '删除用户'
-            }
+            operation: null,
+            dialogShow: false,
+            loading: false
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.messages = operate.messages;
-                    this.model.userName = '';
-                    this.model.jobNumber = '';
-                    if (selected) {
-                        this.model.userName = selected.userName;
-                        this.model.jobNumber = selected.jobNumber;
-                    }
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '删除用户';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.messages = operate.messages;
+                this.model.userName = '';
+                this.model.jobNumber = '';
+                if (selected) {
+                    this.model.userName = selected.userName;
+                    this.model.jobNumber = selected.jobNumber;
+                }
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                if (this.model.userName && this.model.jobNumber) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.close.confirm.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.doClose();
-                            this.$emit('operateUser', this.model);
-                        }
-                    })
-                } else {
-                    this.$messageBox('选择的用户名或工号为空');
-                }
-            },
-            cancel() {
-                let operate = {
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            if (this.model.userName && this.model.jobNumber) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
+                    operation: OperationEvent.Command.close.confirm.operation
+                };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.loading = true;
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                    this.loading = false;
                     if (valid) {
                         this.doClose();
+                        this.$emit('operateUser', this.model);
                     }
-                }).catch(error => { this.doClose(); });
+                });
+            } else {
+                this.$messageBox('选择的用户名或工号为空');
             }
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -131,4 +141,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
index 33d38059f..4b421f185 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
@@ -1,170 +1,181 @@
 <template>
-    <el-dialog class="ningbo-01__systerm user-edit" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" append-to-body v-dialogDrag>
-        <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
-            <el-form size="small" label-width="90px" :model="model" label-position="left" :rules="rules" ref="form">
-                <el-form-item label="工号:" prop="jobNumber">
-                    <el-input v-model="model.jobNumber" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="用户名:" prop="userName">
-                    <el-input v-model="model.userName" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="原始密码:" prop="oldPassword">
-                    <el-input type="oldPassword" v-model="model.oldPassword"></el-input>
-                </el-form-item>
-                <el-form-item label="密码:" prop="password">
-                    <el-input type="password" v-model="model.password"></el-input>
-                </el-form-item>
-                <el-form-item label="确认密码:" prop="confirm">
-                    <el-input type="password" v-model="model.confirm"></el-input>
-                </el-form-item>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm user-edit"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+    append-to-body
+  >
+    <div style="padding: 15px 40px; border: 1px double lightgray; margin: 20px 10px; ">
+      <el-form ref="form" size="small" label-width="90px" :model="model" label-position="left" :rules="rules">
+        <el-form-item label="工号:" prop="jobNumber">
+          <el-input v-model="model.jobNumber" disabled />
+        </el-form-item>
+        <el-form-item label="用户名:" prop="userName">
+          <el-input v-model="model.userName" disabled />
+        </el-form-item>
+        <el-form-item label="原始密码:" prop="oldPassword">
+          <el-input v-model="model.oldPassword" type="oldPassword" />
+        </el-form-item>
+        <el-form-item label="密码:" prop="password">
+          <el-input v-model="model.password" type="password" />
+        </el-form-item>
+        <el-form-item label="确认密码:" prop="confirm">
+          <el-input v-model="model.confirm" type="password" />
+        </el-form-item>
 
-            </el-form>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-    </el-dialog>
+      </el-form>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <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 { mapGetters } from 'vuex';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'UserEdit',
-        components: {
-        },
-        data() {
-            return {
-                operate: {},
-                selected: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                model: {
-                    type: 'EDIT',
-                    jobNumber: '',
-                    userName: '',
-                    oldPassword: '',
-                    password: '',
-                    confirm: '',
-                },
-                rules: {
-                    jobNumber: [
-                        { required: true, message: '请输入工号', trigger: 'blur' }
-                    ],
-                    userName: [
-                        { required: true, message: '请输入用户名', trigger: 'blur' }
-                    ],
-                    oldPassword: [
-                        { required: true, message: '请输入原始密码', trigger: 'change' }
-                    ],
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'change' }
-                    ],
-                    confirm: [
-                        { required: true, message: '请再次输入新密码', trigger: 'change' }
-                    ],
-                },
+export default {
+    name: 'UserEdit',
+    components: {
+    },
+    data() {
+        return {
+            operate: {},
+            selected: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            model: {
+                type: 'EDIT',
+                jobNumber: '',
+                userName: '',
+                oldPassword: '',
+                password: '',
+                confirm: ''
+            },
+            rules: {
+                jobNumber: [
+                    { required: true, message: '请输入工号', trigger: 'blur' }
+                ],
+                userName: [
+                    { required: true, message: '请输入用户名', trigger: 'blur' }
+                ],
+                oldPassword: [
+                    { required: true, message: '请输入原始密码', trigger: 'change' }
+                ],
+                password: [
+                    { required: true, message: '请输入新密码', trigger: 'change' }
+                ],
+                confirm: [
+                    { required: true, message: '请再次输入新密码', trigger: 'change' }
+                ]
             }
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        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.Command.close.confirm.domId : '';
-            },
-            title() {
-                return '用户编辑页面'
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
+        },
+        title() {
+            return '用户编辑页面';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate, selected) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
+                this.loading = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+                this.$nextTick(() => {
+                    this.$refs.form.resetFields();
+                    this.selected = selected;
+                    if (selected) {
+                        this.model.jobNumber = selected.jobNumber;
+                        this.model.userName = selected.userName;
+                    }
+                });
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
         },
-        methods: {
-            doShow(operate, selected) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                    this.$nextTick(() => {
-                        this.$refs.form.resetFields();
-                        this.selected = selected;
-                        if (selected) {
-                            this.model.jobNumber = selected.jobNumber;
-                            this.model.userName = selected.userName;
+        commit() {
+            this.$refs['form'].validate((valid) => {
+                if (valid) {
+                    const operate = {
+                        type: this.operate.type,
+                        operation: OperationEvent.Command.close.confirm.operation
+                    };
+
+                    this.loading = true;
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                        this.loading = false;
+                        if (valid) {
+                            if (this.selected.password !== this.model.oldPassword) {
+                                this.$messageBox('原始密码错误');
+                            } else if (this.model.password !== this.model.confirm) {
+                                this.$messageBox('二次输入的密码错误');
+                            } else if (this.model.oldPassword === this.model.password) {
+                                this.$messageBox('老密码和新密相同');
+                            } else {
+                                this.doClose();
+                                this.$emit('operateUser', this.model);
+                            }
                         }
                     });
+                } else {
+                    return false;
                 }
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
-                this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                this.$refs['form'].validate((valid) => {
-                    if (valid) {
-                        let operate = {
-                            type: this.operate.type,
-                            operation: OperationEvent.Command.close.confirm.operation,
-                        }
-
-                        this.loading = true;
-                        this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                            this.loading = false;
-                            if (valid)
-                                if (this.selected.password !== this.model.oldPassword) {
-                                    this.$messageBox('原始密码错误');
-                                } else if (this.model.password !== this.model.confirm) {
-                                    this.$messageBox('二次输入的密码错误');
-                                } else if (this.model.oldPassword === this.model.password) {
-                                    this.$messageBox('老密码和新密相同');
-                                } else {
-                                    this.doClose();
-                                    this.$emit('operateUser', this.model);
-                                }
-                        })
-                    } else {
-                        return false;
-                    }
-                });
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
                 }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            }
+            }).catch(error => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -175,4 +186,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
index d3b7c130e..7bbd277fb 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -135,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
index d3f0835a1..c92441f6b 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -131,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -159,7 +160,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -183,7 +184,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
index 0348a0cd8..9f6c97add 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
@@ -1,123 +1,133 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="600px" :before-close="doClose"
-        :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="height: 70px;">
-            <div style="position: relative; left: 10px;">
-            </div>
-            <div style="position: relative; left: 80px;">
-                <div style="width:100%">
-                    <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
-                    <el-button style="position: absolute; right: 95px;" :id="domIdConfirm" type="primary"
-                        :loading="loading" @click="commit">确定</el-button>
-                </div>
-                <div style="width:100%; padding-top: 20px">
-                    <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
-                </div>
-            </div>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="height: 70px;">
+      <div style="position: relative; left: 10px;" />
+      <div style="position: relative; left: 80px;">
+        <div style="width:100%">
+          <span style="padding-left: 60px">ControlMonitor 1.3.5.0</span>
+          <el-button
+            :id="domIdConfirm"
+            style="position: absolute; right: 95px;"
+            type="primary"
+            :loading="loading"
+            @click="commit"
+          >确定</el-button>
         </div>
-        <div style="padding: 10px;  margin: 5px; ">
-            <el-table :data="tableData" style="width: 100%;" height="400">
-                <el-table-column prop="moduleName" label="模块名称" width="180">
-                </el-table-column>
-                <el-table-column prop="version" label="版本" width="180">
-                </el-table-column>
-                <el-table-column prop="updateDate" label="修改日期">
-                </el-table-column>
-            </el-table>
+        <div style="width:100%; padding-top: 20px">
+          <span> 版权所有（C）2010-2011 北京玖琏科技有限公司</span>
         </div>
-    </el-dialog>
+      </div>
+    </div>
+    <div style="padding: 10px;  margin: 5px; ">
+      <el-table :data="tableData" style="width: 100%;" height="400">
+        <el-table-column prop="moduleName" label="模块名称" width="180" />
+        <el-table-column prop="version" label="版本" width="180" />
+        <el-table-column prop="updateDate" label="修改日期" />
+      </el-table>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        data() {
-            return {
-                tableData: [
-                    {
-                        moduleName: '主程序版本:',
-                        version: '123',
-                        updateDate: '123'
-                    }
-                ],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
-        },
-        computed: {
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '关于ControlMonitor'
-            }
-        },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
-        },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
+export default {
+    name: 'ManageUser',
+    data() {
+        return {
+            tableData: [
+                {
+                    moduleName: '主程序版本:',
+                    version: '123',
+                    updateDate: '123'
                 }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+            ],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '关于ControlMonitor';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
-                this.$store.dispatch('training/emitTipFresh');
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.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();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
-                }
-
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
+                this.operate = operate || {};
+                this.operation = operate.operation;
             }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
+                this.$store.dispatch('training/emitTipFresh');
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -128,4 +138,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
index 6c22ac606..688ea98e2 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
@@ -1,282 +1,300 @@
 <template>
-    <el-dialog class="ningbo-01__systerm manage-user" :title="title" :visible.sync="show" width="420px"
-        :before-close="doClose" :zIndex="2000" :modal="false" :close-on-click-modal="false" v-dialogDrag>
-        <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
-            <span class="base-label">用户列表</span>
-            <el-row>
-                <el-col :span="18">
-                    <el-table ref="multipleTable" :data="tableData" border row-key="code" style="width: 100%"
-                        height="450" center size="mini" highlight-current-row @row-click="chooseUser">
-                        <el-table-column prop="jobNumber" label="工号" width="120">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.jobNumber}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userName" label="用户名">
-                            <template slot-scope="scope">
-                                <span>{{scope.row.userName}}</span>
-                            </template>
-                        </el-table-column>
-                        <el-table-column width="20">
-                        </el-table-column>
-                    </el-table>
-                </el-col>
-                <el-col :span="4">
-                    <el-button style="margin-top: 140px; margin-left: 10px;" :id="domIdFreshUser" @click="freshUser">刷新
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdAddUser" @click="addUser">增加
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdEditUser" @click="editUser">修改
-                    </el-button>
-                    <el-button style="margin-top: 30px; margin-left: 10px;" :id="domIdDelUser" @click="delUser">删除
-                    </el-button>
-                </el-col>
-            </el-row>
-        </div>
-        <el-row justify="center" class="button-group">
-            <el-col :span="8" :offset="6">
-                <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-            </el-col>
-            <el-col :span="8" :offset="0">
-                <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-            </el-col>
-        </el-row>
-        <user-add ref="userAdd" @operateUser="operateUser"></user-add>
-        <user-edit ref="userEdit" @operateUser="operateUser"></user-edit>
-        <user-delete ref="userDelete" @operateUser="operateUser"></user-delete>
-    </el-dialog>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm manage-user"
+    :title="title"
+    :visible.sync="show"
+    width="420px"
+    :before-close="doClose"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <div style="padding: 5px 5px; border: 1px double lightgray; margin: 20px 0px; ">
+      <span class="base-label">用户列表</span>
+      <el-row>
+        <el-col :span="18">
+          <el-table
+            ref="multipleTable"
+            :data="tableData"
+            border
+            row-key="code"
+            style="width: 100%"
+            height="450"
+            center
+            size="mini"
+            highlight-current-row
+            @row-click="chooseUser"
+          >
+            <el-table-column prop="jobNumber" label="工号" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.jobNumber }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userName" label="用户名">
+              <template slot-scope="scope">
+                <span>{{ scope.row.userName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column width="20" />
+          </el-table>
+        </el-col>
+        <el-col :span="4">
+          <el-button :id="domIdFreshUser" style="margin-top: 140px; margin-left: 10px;" @click="freshUser">刷新
+          </el-button>
+          <el-button :id="domIdAddUser" style="margin-top: 30px; margin-left: 10px;" @click="addUser">增加
+          </el-button>
+          <el-button :id="domIdEditUser" style="margin-top: 30px; margin-left: 10px;" @click="editUser">修改
+          </el-button>
+          <el-button :id="domIdDelUser" style="margin-top: 30px; margin-left: 10px;" @click="delUser">删除
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+    <el-row justify="center" class="button-group">
+      <el-col :span="8" :offset="6">
+        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
+      </el-col>
+      <el-col :span="8" :offset="0">
+        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
+      </el-col>
+    </el-row>
+    <user-add ref="userAdd" @operateUser="operateUser" />
+    <user-edit ref="userEdit" @operateUser="operateUser" />
+    <user-delete ref="userDelete" @operateUser="operateUser" />
+  </el-dialog>
 </template>
 
 <script>
-    import { mapGetters } from 'vuex';
-    import UserAdd from './childDialog/userAdd';
-    import UserEdit from './childDialog/userEdit';
-    import UserDelete from './childDialog/userDelete';
-    import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { mapGetters } from 'vuex';
+import UserAdd from './childDialog/userAdd';
+import UserEdit from './childDialog/userEdit';
+import UserDelete from './childDialog/userDelete';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
-    export default {
-        name: 'ManageUser',
-        components: {
-            UserAdd,
-            UserEdit,
-            UserDelete
+export default {
+    name: 'ManageUser',
+    components: {
+        UserAdd,
+        UserEdit,
+        UserDelete
+    },
+    data() {
+        return {
+            tableData: [],
+            operate: {},
+            operation: null,
+            dialogShow: false,
+            loading: false,
+            selected: null
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationStandList'
+        ]),
+        show() {
+            return this.dialogShow && !this.$store.state.menuOperation.break;
         },
-        data() {
-            return {
-                tableData: [],
-                operate: {},
-                operation: null,
-                dialogShow: false,
-                loading: false,
-                selected: null,
-            }
+        domIdAddUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
         },
-        computed: {
-            ...mapGetters('map', [
-                'stationStandList'
-            ]),
-            show() {
-                return this.dialogShow && !this.$store.state.menuOperation.break;
-            },
-            domIdAddUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.addUser.domId : '';
-            },
-            domIdEditUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
-            },
-            domIdDelUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
-            },
-            domIdFreshUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
-            },
-            domIdChooseUser() {
-                return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
-            },
-            domIdCancel() {
-                return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-            },
-            domIdConfirm() {
-                return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
-            },
-            title() {
-                return '用户管理'
-            }
+        domIdEditUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.editUser.domId : '';
         },
-        mounted() {
-            this.$nextTick(() => {
-                this.$store.dispatch('training/tipReload');
-            })
+        domIdDelUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.delUser.domId : '';
         },
-        methods: {
-            doShow(operate) {
-                //非断电激活时设置初始值
-                if (!this.dialogShow) {
-                    this.loading = false;
-                    this.operate = operate || {};
-                    this.operation = operate.operation;
-                }
-
-                this.dialogShow = true;
-                this.$nextTick(function () {
-                    this.$store.dispatch('training/emitTipFresh');
-                });
-            },
-            doClose() {
+        domIdFreshUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.freshUser.domId : '';
+        },
+        domIdChooseUser() {
+            return this.dialogShow ? OperationEvent.Command.manage.chooseUser.domId : '';
+        },
+        domIdCancel() {
+            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
+        },
+        domIdConfirm() {
+            return this.dialogShow ? OperationEvent.Command.close.menu.domId : '';
+        },
+        title() {
+            return '用户管理';
+        }
+    },
+    mounted() {
+        this.$nextTick(() => {
+            this.$store.dispatch('training/tipReload');
+        });
+    },
+    methods: {
+        doShow(operate) {
+            // 非断电激活时设置初始值
+            if (!this.dialogShow) {
                 this.loading = false;
-                this.dialogShow = false;
+                this.operate = operate || {};
+                this.operation = operate.operation;
+            }
+
+            this.dialogShow = true;
+            this.$nextTick(function () {
                 this.$store.dispatch('training/emitTipFresh');
-            },
-            //添加用户
-            addUser() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.addUser.operation,
+            });
+        },
+        doClose() {
+            this.loading = false;
+            this.dialogShow = false;
+            this.$store.dispatch('training/emitTipFresh');
+        },
+        // 添加用户
+        addUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.addUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
+                    this.$refs.userAdd.doShow(operate);
                 }
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 编辑用户
+        editUser() {
+            if (this.selected) {
+                const operate = {
+                    type: this.operate.type,
+                    operation: OperationEvent.Command.manage.editUser.operation
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.$refs.userAdd.doShow(operate);
+                        this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
-                })
-            },
-            //编辑用户
-            editUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.editUser.operation,
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userEdit.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //删除用户
-            delUser() {
-                if (this.selected) {
-                    let operate = {
-                        type: this.operate.type,
-                        operation: OperationEvent.Command.manage.delUser.operation,
-                        messages: [`你确定删除用户${this.selected.userName}吗？`]
-                    }
-
-                    this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                        this.loading = false;
-                        if (valid) {
-                            this.$refs.userDelete.doShow(operate, this.selected);
-                        }
-                    }).catch(error => {
-                        this.loading = false;
-                    })
-                } else {
-                    this.$messageBox('请先选择用户');
-                }
-            },
-            //刷新用户
-            freshUser() {
-                let operate = {
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 删除用户
+        delUser() {
+            if (this.selected) {
+                const operate = {
                     type: this.operate.type,
-                    operation: OperationEvent.Command.manage.freshUser.operation,
-                }
+                    operation: OperationEvent.Command.manage.delUser.operation,
+                    messages: [`你确定删除用户${this.selected.userName}吗？`]
+                };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            //选择用户
-            chooseUser(row) {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.manage.chooseUser.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    this.loading = false;
-                    this.selected = row;
-                }).catch(error => {
-                    this.loading = false;
-                })
-            },
-            commit() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.close.menu.operation,
-                }
-
-                this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
-                        this.doClose();
+                        this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
+                });
+            } else {
+                this.$messageBox('请先选择用户');
+            }
+        },
+        // 刷新用户
+        freshUser() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.freshUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        // 选择用户
+        chooseUser(row) {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.manage.chooseUser.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                this.selected = row;
+            }).catch(() => {
+                this.loading = false;
+            });
+        },
+        commit() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.close.menu.operation
+            };
+
+            this.loading = true;
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.loading = false;
+                if (valid) {
                     this.doClose();
-                })
-            },
-            cancel() {
-                let operate = {
-                    type: this.operate.type,
-                    operation: OperationEvent.Command.cancel.menu.operation,
                 }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+            });
+        },
+        cancel() {
+            const operate = {
+                type: this.operate.type,
+                operation: OperationEvent.Command.cancel.menu.operation
+            };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                    if (valid) {
-                        this.doClose();
-                    }
-                }).catch(error => { this.doClose(); });
-            },
-            //增删改函数处理
-            operateUser(data) {
-                if (data && data.type === 'ADD') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index < 0) {
-                        this.tableData.push({
-                            jobNumber: data.jobNumber,
-                            userName: data.userName,
-                            password: data.password
-                        });
-                    } else {
-                        this.$messageBox('添加失败，存在相同工号的用户');
-                    }
-                } else if (data && data.type === 'EDIT') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData[index].password = data.password;
-                        this.tableData[index].userName = data.userName;
-                    } else {
-                        this.$messageBox('修改失败');
-                    }
-                } else if (data && data.type === 'DELETE') {
-                    let index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber }));
-                    if (index >= 0) {
-                        this.tableData.splice(index, 1);
-                    } else {
-                        this.$messageBox('删除失败');
-                    }
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.doClose();
+                }
+            }).catch(() => { this.doClose(); });
+        },
+        // 增删改函数处理
+        operateUser(data) {
+            if (data && data.type === 'ADD') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index < 0) {
+                    this.tableData.push({
+                        jobNumber: data.jobNumber,
+                        userName: data.userName,
+                        password: data.password
+                    });
+                } else {
+                    this.$messageBox('添加失败，存在相同工号的用户');
+                }
+            } else if (data && data.type === 'EDIT') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData[index].password = data.password;
+                    this.tableData[index].userName = data.userName;
+                } else {
+                    this.$messageBox('修改失败');
+                }
+            } else if (data && data.type === 'DELETE') {
+                const index = this.tableData.indexOf(this.tableData.find(elem => { return elem.jobNumber === data.jobNumber; }));
+                if (index >= 0) {
+                    this.tableData.splice(index, 1);
+                } else {
+                    this.$messageBox('删除失败');
                 }
             }
         }
     }
+};
 </script>
 <style scoped>
     .ningbo-01__systerm .el-dialog .base-label {
@@ -287,4 +305,4 @@
         padding: 0 5px;
         background-color: #F0F0F0;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
index ae759a395..a3778e533 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
index 5eaa74ee4..c2250ed4b 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -113,7 +114,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -133,7 +134,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
index 133de1d96..813c752ac 100644
--- a/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -150,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
index 2e98c6476..46df0698c 100644
--- a/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
index 40a2936a9..e128fd830 100644
--- a/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/race_01/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
@@ -86,7 +86,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -98,7 +98,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/race_01/planConvert.js b/src/jmapNew/theme/race_01/planConvert.js
index 12786dd2c..99e33e097 100644
--- a/src/jmapNew/theme/race_01/planConvert.js
+++ b/src/jmapNew/theme/race_01/planConvert.js
@@ -2,10 +2,10 @@ import { createMartPoint, createSeriesModel, createMarkLineModels, hexColor, con
 import store from '@/store/index_APP_TARGET';
 export default {
     /** 边缘高度*/
-    EdgeHeight: 600,
+    EdgeHeight: 600 / 3,
 
     /** 间隔高度*/
-    CoordMultiple: 1,
+    CoordMultiple: 1 / 3,
 
     /** 偏移时间*/
     TranslationTime: 60 * 60 * 2,
@@ -131,7 +131,6 @@ export default {
                             if (index == 0 && train.stationTimeList[index].stationCode != train.stationTimeList[index + 1].stationCode ||
 								index == train.stationTimeList.length - 2 && train.stationTimeList[index].secondTime != train.stationTimeList[index + 1].secondTime ||
 								index > 0 && index < train.stationTimeList.length - 1) {
-                                // ${train.directionCode}
                                 const aa = `${train.tripNumber}`;
                                 opt.data.push([elem.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, elem, elem.right, false), elem.stationCode, aa]);
                             }
@@ -142,7 +141,6 @@ export default {
                             lastPoint = train.stationTimeList[idx - 1];
                             nextPoint = service.tripNumberDataList[j + 1].stationTimeList[1];
                             num = this.computedReentryNumber(train.tripNumber);
-                            // ${train.directionCode}
                             const aa = `${train.tripNumber}`;
                             opt.data.push([lastPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, lastPoint, train.right, true, num), lastPoint.stationCode, aa]);
                             opt.data.push([nextPoint.secondTime, this.getCoordYByElem(stations, kmRangeCoordMap, nextPoint, train.right, true, num), nextPoint.stationCode, aa]);
@@ -259,7 +257,7 @@ export default {
     initializeYaxis(stations) {
         return createMarkLineModels(stations, (elem) => {
             return this.EdgeHeight + elem.kmRange * this.CoordMultiple;
-        });
+        }, {yAxisIndex:0});
     },
 
     /** 将后台数据转换为试图序列模型*/
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
index 1554820b7..d0326aeb3 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/childDialog/confirmTrain.vue
@@ -144,7 +144,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -160,7 +160,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
index c1320de3f..a21bc01ae 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDelete.vue
@@ -117,7 +117,7 @@ export default {
                 operation: OperationEvent.Train.delTrainId.trainNumberChange.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -135,7 +135,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -156,7 +156,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
index 702a89bc1..a95b79522 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainDetail.vue
@@ -108,7 +108,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Train.trainDetailInfo.confirm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -120,7 +120,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
index 2f9423a68..ebb4bd976 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainEditNumber.vue
@@ -97,7 +97,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -117,7 +117,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
index c38c3b47e..29fc434d0 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainMove.vue
@@ -159,7 +159,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -180,7 +180,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue b/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
index 41076e5de..5704d8190 100644
--- a/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
+++ b/src/jmapNew/theme/xian_01/menus/dialog/trainSwitch.vue
@@ -164,7 +164,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -185,7 +185,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
index c5dbef487..1659f8bba 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userAdd.vue
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -151,7 +151,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
index a9549de27..0ddfcce98 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userDelete.vue
@@ -105,7 +105,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -122,7 +122,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
index 75809453c..05cf930b1 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/childDialog/userEdit.vue
@@ -142,7 +142,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -168,7 +168,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
index 3040a30cd..f7b21a519 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/helpAbout.vue
@@ -103,7 +103,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -119,7 +119,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
index 1148a9d02..42742eec4 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/manageUser.vue
@@ -153,7 +153,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
@@ -171,7 +171,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
@@ -193,7 +193,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
@@ -213,7 +213,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
             }).catch(() => {
                 this.loading = false;
@@ -227,7 +227,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
             }).catch(() => {
@@ -241,7 +241,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -257,7 +257,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
index 9fd3cab96..73ca8cbec 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainAdd.vue
@@ -131,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -154,7 +154,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
index 96c46f725..c244f1da2 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainDelete.vue
@@ -113,7 +113,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -136,7 +136,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
index 180469290..e06d8a657 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/trainTranstalet.vue
@@ -130,7 +130,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -153,7 +153,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
index d9bfaccfe..d0fedf060 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewDevice.vue
@@ -97,7 +97,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -112,7 +112,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
index 38c635745..94e03751a 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewName.vue
@@ -132,7 +132,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -147,7 +147,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
index d103d9363..a1076c9d5 100644
--- a/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuDialog/viewTrainId.vue
@@ -139,7 +139,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -154,7 +154,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.setTrainDispaly();
diff --git a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
index 88c45c4a5..c4bfd350d 100644
--- a/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_01/menus/passiveDialog/alarm.vue
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -190,7 +190,7 @@ export default {
             const operate = {
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue
index db07cb3b6..587a9ebaa 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/cancelAllLimit.vue
@@ -82,7 +82,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmTip from './childDialog/confirmTip';
 
 export default {
@@ -171,7 +172,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.openMessage.operation
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = true;
@@ -186,7 +187,7 @@ export default {
                     operation: OperationEvent.LimitControl.CancelAllLimit.closeMessage.operation
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                         this.isOpenMessage = false;
@@ -207,7 +208,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm1.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -227,7 +228,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm2.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.isOpenMessage = true;
@@ -245,7 +246,7 @@ export default {
                 type: MapDeviceType.LimitControl.type,
                 operation: OperationEvent.LimitControl.CancelAllLimit.confirm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (!this.isOpenMessage) {
                     this.doClose();
@@ -266,7 +267,7 @@ export default {
                 operation: OperationEvent.LimitControl.CancelAllLimit.close.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.$refs.ConfirmTip.doClose();
                 this.isOpenMessage = false;
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue
index 9868b4224..b7a0f5bc4 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmControl.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
 
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue
index be2437097..efdeb8cfd 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/childDialog/confirmSignalUnlock.vue
@@ -26,7 +26,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'RouteUnlockConfirm',
@@ -87,7 +88,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
@@ -106,7 +107,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.$emit('setOperate', { step: 0, success: false });
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue
index 111bf330c..cba7042fd 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/routeDetail.vue
@@ -61,7 +61,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
index 7562d79bd..ab178bfa8 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stationCmdControl.vue
@@ -77,7 +77,8 @@
   </div>
 </template>
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import { now } from '@/utils/date';
 
 export default {
@@ -263,7 +264,7 @@ export default {
 
             this.setMessage('请点击“确认1”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击下达命令', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 1 });
@@ -290,7 +291,7 @@ export default {
 
             this.setMessage('请点击“确认2”按钮，确认命令！');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认1', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.timeCountCommand = -1;
@@ -320,7 +321,7 @@ export default {
 
             this.setMessage('');
             this.writeRecord({ order: ++this.order, date: now(), context: '点击确认2', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.timeCountCommand = -1;
                 this.timeCountConfirm = -1;
                 this.setButtonEnable({ step: -1 });
@@ -351,7 +352,7 @@ export default {
             }
 
             this.writeRecord({ order: ++this.order, date: now(), context: '点击终止', result: '' });
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.setButtonEnable({ step: 0 });
@@ -369,7 +370,7 @@ export default {
                 operation: OperationEvent.Command.close.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
index 0fc1e8cbb..fcb775617 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
@@ -67,7 +67,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { getSimulationDestinationList } from '@/api/jmap/mapdraft';
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue
index aef039e74..7201d687f 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userAdd.vue
@@ -41,7 +41,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserAdd',
@@ -129,7 +129,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.model.password === this.model.confirm) {
@@ -151,11 +151,11 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); this.model; });
+            }).catch(() => { this.doClose(); this.model; });
         }
     }
 };
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue
index ff05bfbb7..a816bee7e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userDelete.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserDelete',
@@ -106,7 +106,7 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.doClose();
@@ -123,11 +123,11 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue
index 8ef99cc49..b2311ec9c 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/childDialog/userEdit.vue
@@ -44,7 +44,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'UserEdit',
@@ -142,7 +142,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             if (this.selected.password !== this.model.oldPassword) {
@@ -168,11 +168,11 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         }
     }
 };
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue
index 03c1a061c..4ab1c983e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorl.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '.@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -113,7 +114,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -141,7 +142,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -165,7 +166,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue
index 968bc5d43..d422b9b0b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/detainTrainContorlUpDown.vue
@@ -27,7 +27,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '.@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -113,7 +114,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -141,7 +142,7 @@ export default {
                 messages: ['确认取消全线上行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -165,7 +166,7 @@ export default {
                 messages: ['确认取消全线下行扣车！']
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue
index 6f116861e..cfa492b4b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/helpAbout.vue
@@ -39,7 +39,8 @@
 </template>
 
 <script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
@@ -104,7 +105,7 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
@@ -120,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue
index 33c7d1a8a..f7656d33c 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/manageUser.vue
@@ -70,7 +70,7 @@ import { mapGetters } from 'vuex';
 import UserAdd from './childDialog/userAdd';
 import UserEdit from './childDialog/userEdit';
 import UserDelete from './childDialog/userDelete';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'ManageUser',
@@ -153,12 +153,12 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.$refs.userAdd.doShow(operate);
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -171,12 +171,12 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userEdit.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
                 });
             } else {
@@ -193,12 +193,12 @@ export default {
                 };
 
                 this.loading = true;
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     this.loading = false;
                     if (valid) {
                         this.$refs.userDelete.doShow(operate, this.selected);
                     }
-                }).catch(error => {
+                }).catch(() => {
                     this.loading = false;
                 });
             } else {
@@ -213,9 +213,9 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -227,10 +227,10 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 this.selected = row;
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
             });
         },
@@ -241,12 +241,12 @@ export default {
             };
 
             this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.loading = false;
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => {
+            }).catch(() => {
                 this.loading = false;
                 this.doClose();
             });
@@ -257,11 +257,11 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
-            }).catch(error => { this.doClose(); });
+            }).catch(() => { this.doClose(); });
         },
         // 增删改函数处理
         operateUser(data) {
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
index 911e8ff3f..6073f62eb 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainAdd.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -153,7 +154,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue
index a49eef5cc..74e34f40f 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainDelete.vue
@@ -34,7 +34,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainAdd',
@@ -113,7 +114,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -136,7 +137,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue
index 1b5a9789e..1ade66b8a 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/trainTranstalet.vue
@@ -47,7 +47,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'TrainTranstalet',
@@ -130,7 +131,7 @@ export default {
                     };
 
                     this.loading = true;
-                    this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                    this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                         this.loading = false;
                         if (valid) {
                             this.doClose();
@@ -153,7 +154,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/menuLimit.vue b/src/jmapNew/theme/xian_02/menus/menuLimit.vue
index c1e1b60d1..c84d1d3ab 100644
--- a/src/jmapNew/theme/xian_02/menus/menuLimit.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuLimit.vue
@@ -10,7 +10,9 @@ import PopMenu from '@/components/PopMenu';
 import CancelAllLimit from './dialog/cancelAllLimit';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'MenuLimit',
@@ -107,7 +109,7 @@ export default {
                 label: MapDeviceType.LimitControl.label,
                 operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.$refs.cancelAllLimit.doShow(operate, this.selected);
diff --git a/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue b/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue
index 88afe22fd..91173c56d 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/alarm.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 
 export default {
     name: 'AlarmDetail',
@@ -179,7 +179,7 @@ export default {
                 operation: OperationEvent.Command.close.alarm.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -191,7 +191,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.alarm.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue b/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue
index 00107205c..e7955383f 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/control.vue
@@ -60,7 +60,8 @@
 
 <script>
 // import { mapGetters } from 'vuex';
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { MapDeviceType } from '@/scripts/cmdPlugin/Config';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 
 export default {
@@ -203,7 +204,7 @@ export default {
             };
 
             this.$store.dispatch('training/emitTipFresh');
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 }
@@ -240,7 +241,7 @@ export default {
                     val: this.serializeCodeListWithSeparator('::')
                 };
 
-                this.$store.dispatch('training/next', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                     if (valid) {
                         this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     }
@@ -261,7 +262,7 @@ export default {
 
             this.clearTimer();
             this.disabledAgree = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.doClose();
@@ -282,7 +283,7 @@ export default {
 
             this.clearTimer();
             this.disabledAgree = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
diff --git a/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue b/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue
index b8b50cdee..bb2d389f3 100644
--- a/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue
+++ b/src/jmapNew/theme/xian_02/menus/passiveDialog/timeout.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { OperationEvent } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 export default {
     name: 'CmdNotice',
     data() {
@@ -86,7 +86,7 @@ export default {
                 operation: OperationEvent.Command.close.notice.operation
             };
 
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
@@ -98,7 +98,7 @@ export default {
                 type: this.operate.type,
                 operation: OperationEvent.Command.close.notice.operation
             };
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 if (valid) {
                     this.doClose();
diff --git a/src/router/index_Common.js b/src/router/index_Common.js
index 5ac7231fd..17c1f04c5 100644
--- a/src/router/index_Common.js
+++ b/src/router/index_Common.js
@@ -16,6 +16,8 @@ const Jlmap3dAssetManager = () => import('@/views/jlmap3d/jl3dassetmanager/asset
 const Jlmap3d = () => import('@/views/jlmap3d/drive/jl3ddrive');
 const Jlmap3dSandbox = () => import('@/views/jlmap3d/simulation/jl3dsimulation');
 const Jlmap3dPassFlow = () => import('@/views/jlmap3d/passflow/jl3dpassflow');
+const Jlmap3dTrafficPlan = () => import('@/views/jlmap3d/trafficplan/jl3dtrafficplan');
+const Jlmap3dTrafficTrain = () => import('@/views/jlmap3d/trafficplan/jl3dtraffictrain');
 const Jlmap3dModel = () => import('@/views/jlmap3d/device/jl3ddevice');
 const Jlmap3dMaintainer = () => import('@/views/jlmap3d/maintainer/jl3dmaintainer');
 const Jlmap3dMaintainerVr = () => import('@/views/jlmap3d/maintainer/jl3dmaintainervr');
@@ -89,6 +91,7 @@ const DesignPlatform = () => import('@/views/designPlatform/index');
 const MapPreviewNew = () => import('@/views/designPlatform/mapPreviewNew');
 const BigScreen = () => import('@/views/designPlatform/bigScreen');
 const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
+const TestRunplan = () => import('@/views/designPlatform/testRunplan');
 
 const Package = () => import('@/views/package/index');
 
@@ -116,7 +119,6 @@ const UserRules = () => import('@/views/orderauthor/rules/index');
 const UserRulesDetail = () => import('@/views/orderauthor/rules/detail');
 
 const DeviceManage = () => import('@/views/system/deviceManage/index');
-const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const StudentManage = () => import('@/views/studentManage');
 const BankManage = () => import('@/views/competitionManage/bankList/index');
 
@@ -205,12 +207,12 @@ export const constantRoutes = [
         path: '/design/jlmap3d/assetmanager',
         component: Jlmap3dAssetManager,
         hidden: true
-	},
-	{
-		path: '/data2json',
-		component: () => import('@/views/planMonitor/data2json/page.vue'),
-		hidden: true
-	},
+    },
+    {
+        path: '/data2json',
+        component: () => import('@/views/planMonitor/data2json/page.vue'),
+        hidden: true
+    },
     { // 线信息
         path: '/AUSline',
         component: PlanMonitorEditAUSLine,
@@ -231,6 +233,16 @@ export const constantRoutes = [
         component: Jlmap3dPassFlow,
         hidden: true
     },
+    {
+        path: '/jlmap3d/trafficplan',
+        component: Jlmap3dTrafficPlan,
+        hidden: true
+    },
+    {
+        path: '/jlmap3d/traffictrain',
+        component: Jlmap3dTrafficTrain,
+        hidden: true
+    },
 
     {
         path: '/jlmap3d/devicemodel',
@@ -379,6 +391,12 @@ export const publicAsyncRoute = [
         path: '/planSchedule/window',
         component: PlanScheduleWicket,
         hidden: true
+    },
+    {
+        // 运行图测试（仿真，仅有按计划行车和初始化操作）
+        path: '/design/runPlan/testRunplan',
+        component: TestRunplan,
+        hidden: true
     }
 ];
 // 城市轨道项目
@@ -573,11 +591,6 @@ export const asyncRouter = [
                     i18n: 'router.publishMapManage'
                 }
             },
-            {
-                path: '/publish/mapSort',
-                component: MapSort,
-                hidden: true
-            },
             { // 发布历史
                 path: 'map/detail',
                 hidden: true,
diff --git a/src/router/index_HEB.js b/src/router/index_HEB.js
index ccbe0c245..ad097c7d7 100644
--- a/src/router/index_HEB.js
+++ b/src/router/index_HEB.js
@@ -46,6 +46,7 @@ const LessonHome = () => import('@/views/lesson/home');
 const LessonDetail = () => import('@/views/lesson/details');
 const BigScreen = () => import('@/views/designPlatform/bigScreen');
 const BigSplitScreen = () => import('@/views/designPlatform/bigSplitScreen');
+const TestRunplan = () => import('@/views/designPlatform/testRunplan');
 
 const ScriptmanageHome = () => import('@/views/scriptManage/home');
 
@@ -97,7 +98,6 @@ const UserRules = () => import('@/views/orderauthor/rules/index');
 const UserRulesDetail = () => import('@/views/orderauthor/rules/detail');
 
 const DeviceManage = () => import('@/views/system/deviceManage/index');
-const MapSort = () => import('@/views/publish/publishMap/mapSort');
 const Approval = () => import('@/views/approval/index');
 
 // import { loginInfo } from '@/scripts/ProjectConfig';
@@ -273,6 +273,12 @@ export const publicAsyncRoute = [
         path: '/device/result/:userExamId',
         component: ExamResult,
         hidden: true
+    },
+    {
+        // 运行图测试（仿真，仅有按计划行车和初始化操作）
+        path: '/design/runPlan/testRunplan',
+        component: TestRunplan,
+        hidden: true
     }
 ];
 export const asyncRouter = [
@@ -466,11 +472,6 @@ export const asyncRouter = [
                     i18n: 'router.publishMapManage'
                 }
             },
-            {
-                path: '/publish/mapSort',
-                component: MapSort,
-                hidden: true
-            },
             { // 发布历史
                 path: 'map/detail',
                 hidden: true,
diff --git a/src/scripts/ConstConfig.js b/src/scripts/ConstConfig.js
index 5b0967b4a..b8383e918 100644
--- a/src/scripts/ConstConfig.js
+++ b/src/scripts/ConstConfig.js
@@ -244,6 +244,20 @@ export default {
             {label: 'PSC控制柜', value: 'PSC'},
             {label: '虚拟电子沙盘', value: 'SANDBOX'},
             {label: '联锁工作站', value: 'ILW'}
+        ],
+        ossList: [
+            { name: '场景1', url: '场景1—桂花园道岔故障（配分版60分）.pdf' },
+            { name: '场景2', url: '场景2—体育馆道岔故障（配分版60分）.pdf' },
+            { name: '场景3', url: '场景3—火车站道岔故障（配分版60分）.pdf' },
+            { name: '场景4', url: '场景4—列车救援（配分版60分）.pdf' },
+            { name: '场景5', url: '场景5—接触网无电（配分版60分）.pdf' },
+            { name: '场景6', url: '场景6—计轴故障试题（配分版60分）.pdf' },
+            { name: '场景7', url: '场景7—大学城道岔故障（配分版40分）.pdf' },
+            { name: '场景8', url: '场景8—车站照明故障（配分版40分）.pdf' },
+            { name: '场景9', url: '场景9—车站站台门故障（配分版40分）.pdf' },
+            { name: '场景10', url: '场景10—列车限速（配分版40分）.pdf' },
+            { name: '场景11', url: '场景11—区间疏导乘客（配分版40分）.pdf' },
+            { name: '场景12', url: '场景12—区域控制器故障（配分版40分）.pdf' }
         ]
     }
 };
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index f234c7cf1..68ef0d60a 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -68,37 +68,6 @@ export const OperatorModel = {
     TRANSFER: '02'
 };
 
-/**
- * 地图设备类型
- */
-export const MapDeviceType = {
-    Link: { type: '01', label: 'Link' },
-    Switch: { type: '02', label: '道岔' },
-    Section: { type: '03', label: '区段' },
-    Signal: { type: '04', label: '信号机' },
-    StationControl: { type: '05', label: '控制模式' },
-    StationStand: { type: '06', label: '站台' },
-    Train: { type: '07', label: '列车' },
-    Station: { type: '08', label: '车站' },
-    TrainWindow: { type: '09', label: '车次窗' },
-    LimitControl: { type: '10', label: '限速' },
-    MixinCommand: { type: '11', label: '混合命令' }
-
-};
-
-/**
- * 根据类型编码获取类型名称
- * @param {*} code
- */
-export function getDeviceTypeByDic(code) {
-    for (var field in MapDeviceType) {
-        if (code === MapDeviceType[field].type) {
-            return field;
-        }
-    }
-    return null;
-}
-
 /**
  * 菜单编号
  */
@@ -145,2077 +114,8 @@ export function getDeviceMenuByDeviceType(type) {
     return null;
 }
 
-/**
- * 操作事件类型
- */
-export const OperationEvent = {
-    // 直接指令
-    Command: {
-        // 取消操作
-        cancel: {
-            menu: {
-                operation: '000',
-                domId: '_Tips-Cancel-Menu'
-            },
-            clearMbm: {
-                operation: '00012',
-                domId: '_Tips-mbm_clear{TOP}'
-            }
-        },
-        // 关闭对话框
-        close: {
-            menu: {
-                operation: '001',
-                domId: '_Tips-Close-Menu'
-            },
-            password: {
-                operation: '0011',
-                domId: '_Tips-Close-Password'
-            },
-            confirm: {
-                operation: '0012',
-                domId: '_Tips-Close-Confirm'
-            },
-            alarm: {
-                operation: '0013',
-                domId: '_Tips-Close-Alarm'
-            },
-            notice: {
-                operation: '0014',
-                domId: '_Tips-Close-Notice'
-            }
-        },
-        // 菜单
-        mBar: {
-            /** 系统 */
-            system: {
-                operation: '002',
-                domId: '_Tips-Mbar-0-System'
-            },
-            /** 查看 */
-            check: {
-                operation: '0021',
-                domId: '_Tips-Mbar-0-Check'
-            },
-            /** 刷新 */
-            fresh: {
-                operation: '0022',
-                domId: '_Tips-Mbar-0-Fresh'
-            },
-            /** 显示 */
-            view: {
-                operation: '0023',
-                domId: '_Tips-Mbar-0-View'
-            },
-            /** 控制模式菜单 */
-            remoteControl: {
-                operation: '0024',
-                domId: '_Tips-Mbar-0-StationControl'
-            },
-            /** 请求区域 */
-            requestZone: {
-                operation: '0025',
-                domId: '_Tips-Mbar-0-StationControl'
-            },
-            /** 历史查询 */
-            historyQuery: {
-                operation: '0026',
-                domId: '_Tips-Mbar-0-HistoryQuery'
-            },
-            /** 用户管理 */
-            userManage: {
-                operation: '0027',
-                domId: '_Tips-Mbar-0-UserManage'
-            },
-            /** 帮助 */
-            help: {
-                operation: '0028',
-                domId: '_Tips-Mbar-0-Help'
-            },
-            /** 计划车操作 */
-            planTrain: {
-                operation: '0029',
-                domId: '_Tips-Mbar-0-PlanTrain'
-            },
-            /** 扣车*/
-            detainControl: {
-                operation: '00291',
-                domId: '_Tips-Mbar-0-detainControl'
-            }
-        },
-        // 前端视图指令
-        view: {
-            /** 设置列车识别号显示*/
-            setTrainIdDisplay: {
-                operation: '003',
-                domId: '_Tips-View-SetTrainIdDisplay'
-            },
-            /** 设置名称显示*/
-            setNameDisplay: {
-                operation: '0031',
-                domId: '_Tips-View-SetNameDisplay'
-            },
-            /** 设置设备显示*/
-            setDeviceDisplay: {
-                operation: '0032',
-                domId: '_Tips-View-SetDeviceDisplay'
-            },
-            setSection: {
-                operation: '0033',
-                domId: '_Tips-View-SetSection'
-            },
-            setSwitch: {
-                operation: '0034',
-                domId: '_Tips-View-SetSwitch'
-            },
-            setSignal: {
-                operation: '0035',
-                domId: '_Tips-View-SetSignal'
-            },
-            setTrainN: {
-                operation: '0036',
-                domId: '_Tips-View-SetTrainN'
-            },
-            setTrainB: {
-                operation: '0037',
-                domId: '_Tips-View-SetTrainB'
-            },
-            amplification: {
-                operation: '0038',
-                domId: '_Tips-View-Amplification'
-            },
-            dpShowTrainN: {
-                operation: '0039',
-                domId: '_Tips-View-DpShowTrainN'
-            }
-        },
-        // 计划车指令
-        planTrain: {
-            /** 添加计划车*/
-            addPlanTrain: {
-                operation: '004',
-                domId: '_Tips-PlanTrain-AddPlanTrain'
-            },
-            /** 平移计划车*/
-            translatPlanTrain: {
-                operation: '0041',
-                domId: '_Tips-PlanTrain-TranslatPlanTrain'
-            },
-            /** 删除计划车*/
-            delPlanTrain: {
-                operation: '0042',
-                domId: '_Tips-PlanTrain-DelPlanTrain'
-            }
-        },
-        // 管理指令
-        manage: {
-            /** 用户管理*/
-            userManage: {
-                operation: '005',
-                domId: '_Tips-Manage-UserManage'
-            },
-            /** 添加用户*/
-            addUser: {
-                operation: '0051',
-                domId: '_Tips-Manage-AddUser'
-            },
-            /** 修改用户*/
-            editUser: {
-                operation: '0052',
-                domId: '_Tips-Manage-EditUser'
-            },
-            /** 删除用户*/
-            delUser: {
-                operation: '0053',
-                domId: '_Tips-Manage-DelUser'
-            },
-            /** 选择用户*/
-            chooseUser: {
-                operation: '0054',
-                domId: '_Tips-Manage-ChooseUser'
-            },
-            /** 刷新用户*/
-            freshUser: {
-                operation: '0055',
-                domId: '_Tips-Manage-FreshUser'
-            }
-        },
-        // 帮助
-        help: {
-            about: {
-                operation: '006',
-                domId: '_Tips-Help-About'
-            }
-        },
-        // 无设备关联的指令
-        order: {
-            choose: {
-                operation: '007',
-                domId: '_Tips-Order-Choose'
-            },
-            choose1: {
-                operation: '0071',
-                domId: '_Tips-Order-Choose1'
-            }
-        }
-    },
-
-    // 道岔操作
-    Switch: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '199'
-            }
-        },
-        // 道岔故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '100'
-            }
-        },
-        // 道岔总定/定位操作
-        locate: {
-            event: '1',
-            button: {
-                operation: '1010',
-                domId: '_Tips-Switch-Locate-Mbm{TOP}'
-            },
-            menu: {
-                operation: '101',
-                domId: '_Tips-Switch-Locate-Menu'
-            }
-        },
-        // 道岔总反/反位操作
-        reverse: {
-            event: '2',
-            button: {
-                operation: '1020',
-                domId: '_Tips-Switch-Reverse-Mbm{TOP}'
-            },
-            menu: {
-                operation: '102',
-                domId: '_Tips-Switch-Reverse-Menu'
-            }
-        },
-        // 道岔单锁
-        lock: {
-            event: '3',
-            button: {
-                operation: '1030',
-                domId: '_Tips-Switch-Lock-Mbm{TOP}'
-            },
-            menu: {
-                operation: '103',
-                domId: '_Tips-Switch-Lock-Menu'
-            }
-        },
-        // 道岔解锁
-        unlock: {
-            event: '4',
-            button: {
-                operation: '1040',
-                domId: '_Tips-Switch-Unlock-Mbm{TOP}'
-            },
-            menu: {
-                operation: '104',
-                domId: '_Tips-Switch-Unlock-Menu'
-            },
-            order: {
-                operation: '1041',
-                domId: '_Tips-Switch-Unlock-Order'
-            },
-            confirm: {
-                operation: '1042',
-                domId: '_Tips-Switch-Unlock-Confirm'
-            },
-            confirm1: {
-                operation: '1043',
-                domId: '_Tips-Switch-Unlock-Confirm1'
-            },
-            confirm2: {
-                operation: '1044',
-                domId: '_Tips-Switch-Unlock-Confirm2'
-            },
-            stop: {
-                operation: '1045',
-                domId: '_Tips-Switch-Unlock-Stop'
-            }
-        },
-        // 道岔封闭
-        block: {
-            event: '5',
-            menu: {
-                operation: '105',
-                domId: '_Tips-Switch-Block-Menu'
-            },
-            confirm: {
-                operation: '1051',
-                domId: '_Tips-Switch-Block-Confirm'
-            }
-        },
-        // 道岔解封
-        unblock: {
-            event: '6',
-            menu: {
-                operation: '106',
-                domId: '_Tips-Switch-Unblock-menu'
-            },
-            order: {
-                operation: '1061',
-                domId: '_Tips-Switch-Unblock-Order'
-            },
-            confirm: {
-                operation: '1062',
-                domId: '_Tips-Switch-Unblock-Confirm'
-            },
-            confirm1: {
-                operation: '1063',
-                domId: '_Tips-Switch-Unblock-Confirm1'
-            },
-            confirm2: {
-                operation: '1064',
-                domId: '_Tips-Switch-Unblock-Confirm2'
-            },
-            stop: {
-                operation: '1065',
-                domId: '_Tips-Switch-Unblock-Stop'
-            }
-        },
-        // 转动
-        turnout: {
-            event: '7',
-            menu: {
-                operation: '107',
-                domId: '_Tips-Switch-Turnout-Menu'
-            }
-        },
-        // 强制扳动
-        turnoutForce: {
-            event: '8',
-            menu: {
-                operation: '108',
-                domId: '_Tips-Switch-TurnoutForce-Menu'
-            }
-        },
-        // 道岔故障解锁
-        fault: {
-            event: '9',
-            menu: {
-                operation: '109',
-                domId: '_Tips-Switch-Fault-Menu'
-            },
-            order: {
-                operation: '1091',
-                domId: '_Tips-Switch-Fault-Order'
-            },
-            confirm: {
-                operation: '1092',
-                domId: '_Tips-Switch-Fault-Confirm'
-            },
-            confirm1: {
-                operation: '1093',
-                domId: '_Tips-Switch-Fault-Confirm1'
-            },
-            confirm2: {
-                operation: '1094',
-                domId: '_Tips-Switch-Fault-Confirm2'
-            },
-            stop: {
-                operation: '1095',
-                domId: '_Tips-Switch-Fault-Stop'
-            }
-        },
-        // 计轴预复位
-        axlePreReset: {
-            event: '10',
-            menu: {
-                operation: '110',
-                domId: '_Tips-Switch-AxlePreReset-Menu'
-            },
-            order: {
-                operation: '1101',
-                domId: '_Tips-Switch-AxlePreReset-Order'
-            },
-            confirm: {
-                operation: '1102',
-                domId: '_Tips-Switch-AxlePreReset-Confirm'
-            },
-            confirm1: {
-                operation: '1103',
-                domId: '_Tips-Switch-AxlePreReset-Confirm1'
-            },
-            confirm2: {
-                operation: '1104',
-                domId: '_Tips-Switch-AxlePreReset-Confirm2'
-            },
-            stop: {
-                operation: '1105',
-                domId: '_Tips-Switch-AxlePreReset-Stop'
-            }
-        },
-        // 切除
-        split: {
-            event: '11',
-            menu: {
-                operation: '111',
-                domId: '_Tips-Switch-Split-Menu'
-            },
-            mbar: {
-                operation: '1111',
-                domId: '_Tips-Switch-Split-Mbar'
-            }
-        },
-        // 激活
-        active: {
-            event: '12',
-            menu: {
-                operation: '112',
-                domId: '_Tips-Switch-Active-Menu'
-            },
-            mbar: {
-                operation: '1121',
-                domId: '_Tips-Switch-Active-Mbar'
-            }
-        },
-        // 设置速度
-        setSpeed: {
-            event: '13',
-            menu: {
-                operation: '113',
-                domId: '_Tips-Switch-SetSpeed-Menu'
-            },
-            order: {
-                operation: '1131',
-                domId: '_Tips-Switch-SetSpeed-Order'
-            },
-            confirm: {
-                operation: '1132',
-                domId: '_Tips-Switch-SetSpeed-Confirm'
-            },
-            confirm1: {
-                operation: '1133',
-                domId: '_Tips-Switch-SetSpeed-Confirm1'
-            },
-            confirm2: {
-                operation: '1134',
-                domId: '_Tips-Switch-SetSpeed-Confirm2'
-            },
-            stop: {
-                operation: '1135',
-                domId: '_Tips-Switch-SetSpeed-Stop'
-            },
-            choose: {
-                operation: '1136',
-                domId: '_Tips-Switch-SetSpeed-Choose'
-            }
-        },
-        // 取消速度
-        cancelSpeed: {
-            event: { query: '15', confirm: '14' },
-            menu: {
-                operation: '114',
-                domId: '_Tips-Switch-CancelSpeed-Menu'
-            },
-            order: {
-                operation: '1141',
-                domId: '_Tips-Switch-CancelSpeed-Order'
-            },
-            confirm: {
-                operation: '1142',
-                domId: '_Tips-Switch-CancelSpeed-Confirm'
-            },
-            confirm1: {
-                operation: '1143',
-                domId: '_Tips-Switch-CancelSpeed-Confirm1'
-            },
-            confirm2: {
-                operation: '1144',
-                domId: '_Tips-Switch-CancelSpeed-Confirm2'
-            },
-            stop: {
-                operation: '1145',
-                domId: '_Tips-Switch-CancelSpeed-Stop'
-            }
-        },
-        // 查询区段详情
-        query: {
-            event: '15',
-            menu: {
-                operation: '115',
-                domId: '_Tips-Switch-Query-Menu'
-            }
-        },
-        // 设置限速
-        setLimitSpeed: {
-            event: '16',
-            menu: {
-                operation: '116',
-                domId: '_Tips-Switch-SetSpeed-Menu'
-            }
-        },
-        // 确认计轴有效
-        alxeEffective: {
-            event: '17',
-            menu: {
-                operation: '117',
-                domId: '_Tips-Switch-Alxe-Effective-Menu'
-            },
-            choose1: {
-                operation: '1171',
-                domId: '_Tips-Switch-Alxe-Effective-Choose-1'
-            },
-            choose2: {
-                operation: '1172',
-                domId: '_Tips-Switch-Alxe-Effective-Choose-2'
-            },
-            confirm1: {
-                operation: '1173',
-                domId: '_Tips-Switch-Alxe-Effective-Confirm-1'
-            },
-            confirm2: {
-                operation: '1174',
-                domId: '_Tips-Switch-Alxe-Effective-Confirm-2'
-            }
-        },
-        // 引导总锁
-        guideLock: {
-            event: '18',
-            button: {
-                operation: '1180',
-                domId: '_Tips-Switch-GuideLock-Button{TOP}'
-            }
-        }
-    },
-
-    // 控制模式操作
-    StationControl: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '299'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '200'
-            }
-        },
-        // 紧急站控
-        emergencyStationControl: {
-            event: '1',
-            menu: {
-                operation: '201',
-                domId: '_Tips-Control-Emergency-Menu'
-            },
-            mbar: {
-                operation: '2011',
-                domId: '_Tips-Control-Emergency-Mbar'
-            },
-            choose: {
-                operation: '2012',
-                domId: '_Tips-Control-Emergency-Choose'
-            },
-            confirm: {
-                operation: '2013',
-                domId: '_Tips-Control-Emergency-Confirm'
-            }
-        },
-        // 请求站控
-        requestStationControl: {
-            event: '2',
-            menu: {
-                operation: '202',
-                domId: '_Tips-Control-Request-Menu'
-            },
-            mbar: {
-                operation: '2021',
-                domId: '_Tips-Control-Request-Mbar'
-            },
-            choose: {
-                operation: '2022',
-                domId: '_Tips-Control-Request-Choose'
-            },
-            confirm: {
-                operation: '2023',
-                domId: '_Tips-Control-Request-Confirm'
-            }
-        },
-        // 强行站控
-        forcedStationControl: {
-            event: '3',
-            menu: {
-                operation: '203',
-                domId: '_Tips-Control-Forced-Menu'
-            },
-            mbar: {
-                operation: '2031',
-                domId: '_Tips-Control-Forced-Mbar'
-            },
-            choose: {
-                operation: '2032',
-                domId: '_Tips-Control-Forced-Choose'
-            },
-            confirm: {
-                operation: '2033',
-                domId: '_Tips-Control-Forced-Confirm'
-            },
-            password: {
-                operation: '2034',
-                domId: '_Tips-Control-Forced-Password'
-            },
-            passwordConfirm: {
-                operation: '2035',
-                domId: '_Tips-Control-Forced-PasswordConfirm'
-            }
-        },
-        // 请求中控
-        requestCentralControl: {
-            event: '4',
-            menu: {
-                operation: '204',
-                domId: '_Tips-Control-Central-Menu'
-            },
-            mbar: {
-                operation: '2041',
-                domId: '_Tips-Control-Central-Mbar'
-            },
-            choose: {
-                operation: '2042',
-                domId: '_Tips-Control-Central-Choose'
-            },
-            confirm: {
-                operation: '2043',
-                domId: '_Tips-Control-Central-Confirm'
-            }
-        },
-        // 控制模式应答同意
-        controlResponse: {
-            event: { centralAgree: '5', centralRefuse: '6', stationAgree: '7', stationRefuse: '8' },
-            menu: {
-                operation: '205',
-                domId: '_Tips-Control-Response-Menu'
-            },
-            choose: {
-                operation: '2052',
-                domId: '_Tips-Control-Response-Choose'
-            },
-            agree: {
-                operation: '2053',
-                domId: '_Tips-Control-Response-Agree'
-            },
-            refuse: {
-                operation: '2054',
-                domId: '_Tips-Control-Response-Refuse'
-            }
-        }
-    },
-
-    // 信号机操作
-    Signal: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '399'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '300'
-            }
-        },
-        // 查询进路
-        query: {
-            event: '1'
-        },
-        // 排列进路
-        arrangementRoute: {
-            event: { query: '1', confirm: '2' },
-            button: {
-                operation: '3010',
-                domId: '_Tips-Signal-ArrangementRoute-Mbm{TOP}'
-            },
-            menu: {
-                operation: '301',
-                domId: '_Tips-Signal-ArrangementRoute-Menu'
-            },
-            choose: {
-                operation: '3011',
-                domId: '_Tips-Signal-ArrangementRoute-Choose'
-            },
-            confirm: {
-                operation: '3012',
-                domId: '_Tips-Signal-ArrangementRoute-Confirm'
-            }
-        },
-        // 取消进路
-        cancelTrainRoute: {
-            event: '3',
-            button: {
-                operation: '3030',
-                domId: '_Tips-Signal-CancelTrainRoute-Mbm{TOP}'
-            },
-            menu: {
-                operation: '303',
-                domId: '_Tips-Signal-CancelTrainRoute-Menu'
-            },
-            confirm: {
-                operation: '3031',
-                domId: '_Tips-Signal-CancelTrainRoute-Confirm'
-            }
-        },
-        // 信号重开
-        reopenSignal: {
-            event: '4',
-            button: {
-                operation: '3040',
-                domId: '_Tips-Signal-Reopen-Mbm'
-            },
-            menu: {
-                operation: '304',
-                domId: '_Tips-Signal-Reopen-Menu'
-            },
-            confirm: {
-                operation: '3041',
-                domId: '_Tips-Signal-Reopen-Confirm'
-            }
-        },
-        // 人解列车进路 (总人解)
-        humanTrainRoute: {
-            event: '5',
-            button: {
-                operation: '3050',
-                domId: '_Tips-Signal-HumanTrainRoute-Mbm{TOP}'
-            },
-            menu: {
-                operation: '305',
-                domId: '_Tips-Signal-HumanTrainRoute-Menu'
-            },
-            confirm: {
-                operation: '3051',
-                domId: '_Tips-Signal-HumanTrainRoute-Confirm'
-            }
-        },
-        // 封锁
-        lock: {
-            event: '6',
-            menu: {
-                operation: '306',
-                domId: '_Tips-Signal-Lock-Menu'
-            },
-            confirm: {
-                operation: '3061',
-                domId: '_Tips-Signal-Lock-Confirm'
-            }
-        },
-        // 解锁
-        unlock: {
-            event: '7',
-            menu: {
-                operation: '307',
-                domId: '_Tips-Signal-Unlock-Menu'
-            },
-            order: {
-                operation: '3071',
-                domId: '_Tips-Signal-Unlock-Order'
-            },
-            confirm: {
-                operation: '3072',
-                domId: '_Tips-Signal-Unlock-Confirm'
-            },
-            confirm1: {
-                operation: '3073',
-                domId: '_Tips-Signal-Unlock-Confirm1'
-            },
-            confirm2: {
-                operation: '3074',
-                domId: '_Tips-Signal-Unlock-Confirm2'
-            },
-            stop: {
-                operation: '3075',
-                domId: '_Tips-Signal-Unlock-Stop'
-            }
-        },
-        // 引导
-        guide: {
-            event: { query: '1', confirm: '8' },
-            button: {
-                operation: '3080',
-                domId: '_Tips-Signal-Guide-Mbm{TOP}'
-            },
-            menu: {
-                operation: '308',
-                domId: '_Tips-Signal-Guide-Menu'
-            },
-            order: {
-                operation: '3081',
-                domId: '_Tips-Signal-Guide-Order'
-            },
-            confirm: {
-                operation: '3082',
-                domId: '_Tips-Signal-Guide-Confirm'
-            },
-            confirm1: {
-                operation: '3083',
-                domId: '_Tips-Signal-Guide-Confirm1'
-            },
-            confirm2: {
-                operation: '3084',
-                domId: '_Tips-Signal-Guide-Confirm2'
-            },
-            stop: { // 福州线 关闭弹窗操作
-                operation: '3085',
-                domId: '_Tips-Signal-Guide-Stop'
-            },
-            choose: {
-                operation: '3086',
-                domId: '_Tips-Signal-Guide-Choose'
-            }
-        },
-        // 设置联锁自动进路
-        setAutoInterlock: {
-            event: '9',
-            button: {
-                operation: '3090',
-                domId: '_Tips-Signal-SetAutoInterlock-Mbm'
-            },
-            menu: {
-                operation: '309',
-                domId: '_Tips-Signal-SetAutoInterlock-Menu'
-            }
-        },
-        // 取消联锁自动进路
-        cancelAutoInterlock: {
-            event: '10',
-            menu: {
-                operation: '310',
-                domId: '_Tips-Signal-CancelAutoInterlock-Menu'
-            }
-        },
-        // 设置联锁自动触发
-        setAutoTrigger: {
-            event: '11',
-            menu: {
-                operation: '311',
-                domId: '_Tips-Signal-SetAutoTrigger-Menu'
-            }
-        },
-        // 取消联锁自动触发
-        cancelAutoTrigger: {
-            event: '12',
-            menu: {
-                operation: '312',
-                domId: '_Tips-Signal-CancelAutoTrigger-Menu'
-            }
-        },
-        // 信号关灯
-        signalClose: {
-            event: '13',
-            menu: {
-                operation: '313',
-                domId: '_Tips-Signal-SignalClose-Menu'
-            },
-            confirm: {
-                operation: '3131',
-                domId: '_Tips-Signal-SignalClose-Confirm'
-            }
-        },
-        // 进路交人工控
-        humanControl: {
-            event: { query: '1', confirm: '14' },
-            button: {
-                operation: '3140',
-                domId: '_Tips-Signal-HumanControl-Button{TOP}'
-            },
-            menu: {
-                operation: '314',
-                domId: '_Tips-Signal-HumanControl-Menu'
-            },
-            choose: {
-                operation: '3141',
-                domId: '_Tips-Signal-HumanControl-Choose'
-            },
-            confirm: {
-                operation: '3142',
-                domId: '_Tips-Signal-HumanControl-Confirm'
-            }
-        },
-        // 进路交自动控
-        atsAutoControl: {
-            event: { query: '1', confirm: '15' },
-            button: {
-                operation: '3150',
-                domId: '_Tips-Signal-AtsAutoControl-Button{TOP}'
-            },
-            menu: {
-                operation: '315',
-                domId: '_Tips-Signal-AtsAutoControl-Menu'
-            },
-            choose: {
-                operation: '3151',
-                domId: '_Tips-Signal-AtsAutoControl-Choose'
-            },
-            confirm: {
-                operation: '3152',
-                domId: '_Tips-Signal-AtsAutoControls-Confirm'
-            }
-        },
-        // 查询进路状态
-        detail: {
-            event: { query: '1', confirm: '16' },
-            menu: {
-                operation: '316',
-                domId: '_Tips-Signal-Detail-Menu'
-            }
-        }
-    },
-
-    // 物理区段操作
-    Section: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '499'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '400'
-            }
-        },
-        // 设置计轴失效
-        alxeFailure: {
-            event: '001',
-            menu: {
-                operation: '4001'
-            }
-        },
-
-        // 查询区段详情
-        query: {
-            event: '1',
-            menu: {
-                operation: '401',
-                domId: '_Tips-Section-Query-Menu'
-            }
-        },
-        // 区故解
-        fault: {
-            event: '2',
-            button: {
-                operation: '4020',
-                domId: '_Tips-Section-Fault-Mbm{TOP}'
-            },
-            menu: {
-                operation: '402',
-                domId: '_Tips-Section-Fault-Menu'
-            },
-            prepare: {
-                operation: '4021',
-                domId: '_Tips-Section-Fault-Prepare'
-            },
-            select: {
-                operation: '4022',
-                domId: '_Tips-Section-Fault-Select'
-            },
-            confirm: {
-                operation: '4023',
-                domId: '_Tips-Section-Fault-Confirm'
-            },
-            confirm1: {
-                operation: '4024',
-                domId: '_Tips-Section-Fault-Confirm1'
-            },
-            confirm2: {
-                operation: '4025',
-                domId: '_Tips-Section-Fault-Confirm2'
-            },
-            order: {
-                operation: '4026',
-                domId: '_Tips-Section-Fault-Order'
-            },
-            stop: {
-                operation: '4027',
-                domId: '_Tips-Section-Fault-Stop'
-            }
-        },
-        // 封锁
-        lock: {
-            event: '3',
-            menu: {
-                operation: '403',
-                domId: '_Tips-Section-Lock-Menu'
-            }
-        },
-        // 解锁
-        unlock: {
-            event: '4',
-            menu: {
-                operation: '404',
-                domId: '_Tips-Section-Unlock-Menu'
-            },
-            order: {
-                operation: '4041',
-                domId: '_Tips-Section-Unlock-Order'
-            },
-            confirm: {
-                operation: '4042',
-                domId: '_Tips-Section-Unlock-Confirm'
-            },
-            confirm1: {
-                operation: '4043',
-                domId: '_Tips-Section-Unlock-Confirm1'
-            },
-            confirm2: {
-                operation: '4044',
-                domId: '_Tips-Section-Unlock-Confirm2'
-            },
-            stop: {
-                operation: '4045',
-                domId: '_Tips-Section-Unlock-Stop'
-            }
-        },
-        // 切除
-        split: {
-            event: '5',
-            menu: {
-                operation: '405',
-                domId: '_Tips-Section-split-Menu'
-            },
-            mbar: {
-                operation: '4051',
-                domId: '_Tips-Section-split-Mbar'
-            }
-        },
-        // 激活
-        active: {
-            event: '6',
-            menu: {
-                operation: '406',
-                domId: '_Tips-Section-Active-Menu'
-            },
-            mbar: {
-                operation: '4061',
-                domId: '_Tips-Section-Active-mbar'
-            }
-        },
-        // 设置速度
-        setSpeed: {
-            event: '7',
-            menu: {
-                operation: '407',
-                domId: '_Tips-Section-SetSpeed-Menu'
-            },
-            order: {
-                operation: '4071',
-                domId: '_Tips-Section-SetSpeed-Order'
-            },
-            confirm: {
-                operation: '4072',
-                domId: '_Tips-Section-SetSpeed-Confirm'
-            },
-            confirm1: {
-                operation: '4073',
-                domId: '_Tips-Section-SetSpeed-Confirm1'
-            },
-            confirm2: {
-                operation: '4074',
-                domId: '_Tips-Section-SetSpeed-Confirm2'
-            },
-            stop: {
-                operation: '4075',
-                domId: '_Tips-Section-SetSpeed-Stop'
-            },
-            choose: {
-                operation: '4076',
-                domId: '_Tips-Section-SetSpeed-Choose'
-            }
-        },
-        // 取消速度
-        cancelSpeed: {
-            event: { query: '1', confirm: '8' },
-            menu: {
-                operation: '408',
-                domId: '_Tips-Section-CancelSpeed-Menu'
-            },
-            order: {
-                operation: '4081',
-                domId: '_Tips-Section-CancelSpeed-Order'
-            },
-            confirm: {
-                operation: '4082',
-                domId: '_Tips-Section-CancelSpeed-Confirm'
-            },
-            confirm1: {
-                operation: '4083',
-                domId: '_Tips-Section-CancelSpeed-Confirm1'
-            },
-            confirm2: {
-                operation: '4084',
-                domId: '_Tips-Section-CancelSpeed-Confirm2'
-            },
-            stop: {
-                operation: '4085',
-                domId: '_Tips-Section-CancelSpeed-Stop'
-            }
-        },
-        // 计轴预复位
-        axlePreReset: {
-            event: '9',
-            button: {
-                operation: '4090',
-                domId: '_Tips-Section-AxlePreReset-Mbm'
-            },
-            menu: {
-                operation: '409',
-                domId: '_Tips-Section-AxlePreReset-Menu'
-            },
-            order: {
-                operation: '4091',
-                domId: '_Tips-Section-AxlePreReset-Order'
-            },
-            confirm: {
-                operation: '4092',
-                domId: '_Tips-Section-AxlePreReset-Confirm'
-            },
-            confirm1: {
-                operation: '4093',
-                domId: '_Tips-Section-AxlePreReset-Confirm1'
-            },
-            confirm2: {
-                operation: '4094',
-                domId: '_Tips-Section-AxlePreReset-Confirm2'
-            },
-            stop: {
-                operation: '4095',
-                domId: '_Tips-Section-AxlePreReset-Stop'
-            }
-        },
-        // 设备状态
-        detail: {
-            event: '10',
-            menu: {
-                operation: '410',
-                domId: '_Tips-Section-detail-Menu'
-            }
-        },
-        // 新建列车
-        newtrain: {
-            event: '11',
-            menu: {
-                operation: '411',
-                domId: '_Tips-Section-Newtrain-Menu'
-            }
-        },
-        // 确认计轴有效
-        alxeEffective: {
-            event: '12',
-            menu: {
-                operation: '412',
-                domId: '_Tips-Section-Alxe-Effective-Menu'
-            },
-            choose1: {
-                operation: '4121',
-                domId: '_Tips-Section-Alxe-Effective-Choose-1'
-            },
-            choose2: {
-                operation: '4122',
-                domId: '_Tips-Section-Alxe-Effective-Choose-2'
-            },
-            confirm1: {
-                operation: '4123',
-                domId: '_Tips-Section-Alxe-Effective-Confirm-1'
-            },
-            confirm2: {
-                operation: '4124',
-                domId: '_Tips-Section-Alxe-Effective-Confirm-2'
-            }
-        },
-        // 设置临时限速
-        setLimitSpeed: {
-            event: '13',
-            menu: {
-                operation: '413',
-                domId: '_Tips-Section-SetLimitSpeed-Menu'
-            },
-            openConversation: {
-                operation: '4131',
-                domId: '_Tips-Section-SetLimitSpeed-OpenConversation'
-            },
-            closeConversation: {
-                operation: '4132',
-                domId: '_Tips-Section-SetLimitSpeed-CloseConversation'
-            },
-            firstLimitSpeed: {
-                operation: '4133',
-                domId: '_Tips-Section-SetLimitSpeed-FirstLimitSpeed{TOP}'
-            },
-            firstStartSection: {
-                operation: '4134',
-                domId: '_Tips-Section-SetLimitSpeed-FirstStartSection{TOP}'
-            },
-            firstStartvalue: {
-                operation: '4135',
-                domId: '_Tips-Section-SetLimitSpeed-FirstStartvalue'
-            },
-            firstEndSection: {
-                operation: '4136',
-                domId: '_Tips-Section-SetLimitSpeed-FirstEndSection{TOP}'
-            },
-            firstEndvalue: {
-                operation: '4137',
-                domId: '_Tips-Section-SetLimitSpeed-FirstEndvalue'
-            },
-            firstCheck: {
-                operation: '4138',
-                domId: '_Tips-Section-SetLimitSpeed-FirstCheck'
-            },
-            firstComfirm: {
-                operation: '4139',
-                domId: '_Tips-Section-SetLimitSpeed-FirstComfirm'
-            },
-            secondLimitSpeed: {
-                operation: '41310',
-                domId: '_Tips-Section-SetLimitSpeed-SecondLimitSpeed{TOP}'
-            },
-            secondStartSection: {
-                operation: '41311',
-                domId: '_Tips-Section-SetLimitSpeed-SecondStartSection{TOP}'
-            },
-            secondStartvalue: {
-                operation: '41312',
-                domId: '_Tips-Section-SetLimitSpeed-SecondStartvalue{TOP}'
-            },
-            secondEndSection: {
-                operation: '41313',
-                domId: '_Tips-Section-SetLimitSpeed-SecondEndSection{TOP}'
-            },
-            secondEndvalue: {
-                operation: '41314',
-                domId: '_Tips-Section-SetLimitSpeed-SecondEndvalue{TOP}'
-            },
-            secondCheck: {
-                operation: '41315',
-                domId: '_Tips-Section-SetLimitSpeed-SecondCheck'
-            },
-            secondComfirm: {
-                operation: '41316',
-                domId: '_Tips-Section-SetLimitSpeed-SecondComfirm'
-            },
-            domIdClose: {
-                operation: '41317',
-                domId: '_Tips-Section-SetLimitSpeed-DomIdClose'
-            },
-            close: {
-                operation: '41318',
-                domId: '_Tips-Section-SetLimitSpeed-close'
-            }
-        },
-        // 确认临时限速
-        confirmLimit: {
-            event: '14',
-            menu: {
-                operation: '414',
-                domId: '_Tips-Section-Confirm-Limit-Menu'
-            }
-        }
-        // 区段详情
-        // detail: {
-        // 	event: '15',
-        // 	menu: {
-        // 		operation: '415',
-        // 		domId: '_Tips-Section-Detail-Menu'
-        // 	}
-        // }
-    },
-
-    // 站台
-    StationStand: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '599'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '500'
-            }
-        },
-        // 提前发车
-        earlyDeparture: {
-            event: '1',
-            menu: {
-                operation: '501',
-                domId: '_Tips-Stand-EarlyDeparture-Menu'
-            },
-            upSelect: {
-                operation: '5011',
-                domId: '_Tips-Stand-EarlyDeparture-upSelect'
-            },
-            downSelect: {
-                operation: '5012',
-                domId: '_Tips-Stand-EarlyDeparture-downSelect'
-            }
-        },
-        // 设置跳停
-        setJumpStop: {
-            event: '2',
-            menu: {
-                operation: '502',
-                domId: '_Tips-Stand-SetJumpStop-Menu'
-            },
-            choose: {
-                operation: '5021',
-                domId: '_Tips-Stand-SetJumpStop-Choose'
-            },
-            select: {
-                operation: '5022',
-                domId: '_Tips-Stand-SetJumpStop-Select'
-            },
-            selfStationStand: {
-                operation: '5023',
-                domId: '_Tips-Stand-SetJumpStop-selfStationStand'
-            },
-            otherStationStand: {
-                operation: '5024',
-                domId: '_Tips-Stand-SetJumpStop-otherStationStand'
-            }
-        },
-        // 取消跳停
-        cancelJumpStop: {
-            event: '3',
-            menu: {
-                operation: '503',
-                domId: '_Tips-Stand-CancelJumpStop-Menu'
-            },
-            choose: {
-                operation: '5031',
-                domId: '_Tips-Stand-CancelJumpStop-Choose'
-            },
-            select: {
-                operation: '5032',
-                domId: '_Tips-Stand-CancelJumpStop-Select'
-            },
-            selfStationStand: {
-                operation: '5033',
-                domId: '_Tips-Stand-CancelJumpStop-selfStationStand'
-            },
-            otherStationStand: {
-                operation: '5034',
-                domId: '_Tips-Stand-CancelJumpStop-otherStationStand'
-            }
-        },
-        // 设置扣车
-        setDetainTrain: {
-            event: '4',
-            menu: {
-                operation: '504',
-                domId: '_Tips-Stand-SetDetainTrain-Menu'
-            }
-        },
-        // 取消扣车
-        cancelDetainTrain: {
-            event: '5',
-            menu: {
-                operation: '505',
-                domId: '_Tips-Stand-CancelDetainTrain-Menu'
-            },
-            choose: {
-                operation: '5051',
-                domId: '_Tips-Stand-cancelDetainTrain-Choose'
-            }
-        },
-        // 强制取消扣车
-        cancelDetainTrainForce: {
-            event: '6',
-            menu: {
-                operation: '506',
-                domId: '_Tips-Stand-CancelDetainTrainForce-Menu'
-            }
-        },
-        // 站台详细信息
-        detail: {
-            event: '7',
-            menu: {
-                operation: '507',
-                domId: '_Tips-Stand-Detail-Menu'
-            }
-        },
-        // 全线取消扣车
-        cancelDetainTrainAll: {
-            event: '8',
-            menu: {
-                operation: '508',
-                domId: '_Tips-Stand-CancelDetainTrainAll-Menu'
-            },
-            choose: {
-                operation: '5081',
-                domId: '_Tips-Stand-CancelDetainTrainAll-Choose'
-            },
-            mbar: {
-                operation: '5082',
-                domId: '_Tips-Stand-CancelDetainTrainAll-Mbar'
-            },
-            confirm: {
-                operation: '5083',
-                domId: '_Tips-Stand-CancelDetainTrainAll-Confirm'
-            }
-        },
-        // 设置停站时间
-        setStopTime: {
-            event: { query: '7', confirm: '9' },
-            menu: {
-                operation: '509',
-                domId: '_Tips-Stand-SetStopTime-Menu'
-            },
-            confirm: {
-                operation: '5091',
-                domId: '_Tips-Stand-SetStopTime-Confirm'
-            },
-            choose1: {
-                operation: '5092',
-                domId: '_Tips-Stand-SetStopTime-Choose-1'
-            },
-            choose2: {
-                operation: '5093',
-                domId: '_Tips-Stand-SetStopTime-Choose-2'
-            },
-            input: {
-                operation: '5094',
-                domId: '_Tips-Stand-SetStopTime-Input'
-            }
-        },
-        // 设置运行等级
-        setRunLevel: {
-            event: { query: '7', confirm: '10' },
-            menu: {
-                operation: '510',
-                domId: '_Tips-Stand-SetRunLevel-Menu'
-            },
-            choose: {
-                operation: '5101',
-                domId: '_Tips-Stand-SetRunLevel-Choose'
-            },
-            confirm: {
-                operation: '5102',
-                domId: '_Tips-Stand-SetRunLevel-confirm'
-            },
-            check: {
-                operation: '5103',
-                domId: '_Tips-Stand-SetRunLevel-check'
-            },
-            chooseLevel: {
-                operation: '5104',
-                domId: '_Tips-Stand-SetRunLevel-chooseLevel'
-            },
-            chooseTrain: {
-                operation: '5105',
-                domId: '_Tips-Stand-SetRunLevel-chooseTrain'
-            },
-            choose1: {
-                operation: '5106',
-                domId: '_Tips-Stand-SetRunLevel-Choose-1'
-            },
-            choose2: {
-                operation: '5107',
-                domId: '_Tips-Stand-SetRunLevel-Choose-2'
-            }
-        },
-        // 设置折返策略
-        setBackStrategy: {
-            event: { query: '7', confirm: '11' },
-            menu: {
-                operation: '511',
-                domId: '_Tips-Stand-SetBackStrategy-Menu'
-            },
-            choose: {
-                operation: '5111',
-                domId: '_Tips-Stand-setBackStrategy-Choose'
-            },
-            confirm: {
-                operation: '5112',
-                domId: '_Tips-Stand-setBackStrategy-confirm'
-            }
-        },
-        // 设置全线扣车
-        setDetainTrainAll: {
-            event: 12,
-            menu: {
-                operation: '512',
-                domId: '_Tips-Stand-SetBackStrategy-Menu'
-            },
-            mbar: {
-                operation: '5121',
-                domId: '_Tips-Stand-setDetainTrainAll-Mbar'
-            },
-            confirm: {
-                operation: '5122',
-                domId: '_Tips-Stand-setDetainTrainAll-confirm'
-            }
-        },
-        cancelUpDetainTrainAll: {
-            event: 13,
-            menu: {
-                operation: '513',
-                domId: '_Tips-Stand-SetBackStrategy-Menu'
-            },
-            mbar: {
-                operation: '5131',
-                domId: '_Tips-Stand-clearUpCar-Mbar'
-            },
-            confirm: {
-                operation: '5132',
-                domId: '_Tips-Stand-clearUpCar-confirm'
-            }
-        },
-        cancelDownDetainTrainAll: {
-            event: 14,
-            menu: {
-                operation: '514',
-                domId: '_Tips-Stand-SetBackStrategy-Menu'
-            },
-            mbar: {
-                operation: '5141',
-                domId: '_Tips-Stand-clearDownCar-Mbar'
-            },
-            confirm: {
-                operation: '5142',
-                domId: '_Tips-Stand-clearDownCar-confirm'
-            }
-        }
-    },
-
-    Station: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '699'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '600'
-            }
-        },
-        // 全站设置联锁自动触发
-        setAutoTrigger: {
-            event: '1',
-            menu: {
-                operation: '601',
-                domId: '_Tips-Station-SetAutoTrigger-Menu'
-            }
-        },
-        // 全站取消联锁自动触发
-        cancelAutoTrigger: {
-            event: '2',
-            menu: {
-                operation: '602',
-                domId: '_Tips-Station-CancelAutoTrigger-Menu'
-            }
-        },
-        // 上电解锁
-        powerUnLock: {
-            event: '3',
-            menu: {
-                operation: '603',
-                domId: '_Tips-Station-PowerUnLock-Menu'
-            },
-            order: {
-                operation: '6031',
-                domId: '_Tips-Station-PowerUnLock-Order'
-            },
-            confirm: {
-                operation: '6032',
-                domId: '_Tips-Station-PowerUnLock-Confirm'
-            },
-            confirm1: {
-                operation: '6033',
-                domId: '_Tips-Station-PowerUnLock-Confirm1'
-            },
-            confirm2: {
-                operation: '6034',
-                domId: '_Tips-Station-PowerUnLock-Confirm2'
-            },
-            stop: {
-                operation: '6035',
-                domId: '_Tips-Station-PowerUnLock-Stop'
-            }
-        },
-        // 执行关键操作测试
-        execKeyOperationTest: {
-            event: '4',
-            menu: {
-                operation: '604',
-                domId: '_Tips-Station-ExecKeyOperationTest-Menu'
-            },
-            order: {
-                operation: '6041',
-                domId: '_Tips-Station-ExecKeyOperationTest-Order'
-            },
-            confirm: {
-                operation: '6042',
-                domId: '_Tips-Station-ExecKeyOperationTest-Confirm'
-            },
-            confirm1: {
-                operation: '6043',
-                domId: '_Tips-Station-ExecKeyOperationTest-Confirm1'
-            },
-            confirm2: {
-                operation: '6044',
-                domId: '_Tips-Station-ExecKeyOperationTest-Confirm2'
-            },
-            stop: {
-                operation: '6045',
-                domId: '_Tips-Station-ExecKeyOperationTest-Stop'
-            }
-        },
-        // 所有进路自排关
-        humanControlALL: {
-            event: '5',
-            menu: {
-                operation: '605',
-                domId: '_Tips-Station-HumanControlALL-Menu'
-            }
-        },
-        // 所有进路自排开
-        atsAutoControlALL: {
-            event: '6',
-            menu: {
-                operation: '606',
-                domId: '_Tips-Station-AtsAutoControlALL-Menu'
-            }
-        },
-        split: {
-            event: '7',
-            mbar: {
-                operation: '6071',
-                domId: '_Tips-Stand-Split-Mbar'
-            },
-            choose: {
-                operation: '6072',
-                domId: '_Tips-Stand-Split-Mbar'
-            },
-            confirm: {
-                operation: '6073',
-                domId: '_Tips-Stand-Split-confirm'
-            }
-        },
-        active: {
-            event: '8',
-            mbar: {
-                operation: '6081',
-                domId: '_Tips-Stand-Active-Mbar'
-            },
-            choose: {
-                operation: '6082',
-                domId: '_Tips-Stand-Split-Mbar'
-            },
-            confirm: {
-                operation: '6083',
-                domId: '_Tips-Stand-Active-confirm'
-            }
-        }
-    },
-
-    // 列车
-    Train: {
-        // 取消故障
-        cancelStoppage: {
-            event: '999',
-            menu: {
-                operation: '799'
-            }
-        },
-        // 故障
-        stoppage: {
-            event: '0',
-            menu: {
-                operation: '700'
-            }
-        },
-        // 添加列车识别号
-        addTrainId: {
-            event: '1',
-            menu: {
-                operation: '701',
-                domId: '_Tips-Train-AddTrainId-Menu'
-            },
-            trainNumberChange: {
-                operation: '7011',
-                domId: '_Tips-Train-AddTrainId-TrainNumberChange'
-            },
-            trainTypeChange: {
-                operation: '7012',
-                domId: '_Tips-Train-AddTrainId-trainTypeChange'
-            },
-            serverNoChange: {
-                operation: '7013',
-                domId: '_Tips-Train-AddTrainId-serverNoChange'
-            },
-            trainNoChange: {
-                operation: '7014',
-                domId: '_Tips-Train-AddTrainId-trainNoChange'
-            },
-            targetCodeChange: {
-                operation: '7015',
-                domId: '_Tips-Train-AddTrainId-targetCodeChange'
-            },
-            confirm: {
-                operation: '7016',
-                domId: '_Tips-Train-AddTrainId-Confirm'
-            },
-            input: {
-                operation: '7017',
-                domId: '_Tips-Train-AddTrainId-Input'
-            }
-        },
-        // 修改列车识别号
-        editTrainId: {
-            event: { query: '9', confirm: '2' },
-            menu: {
-                operation: '702',
-                domId: '_Tips-Train-EditTrainId-Menu'
-            },
-            trainNumberChange: {
-                operation: '7021',
-                domId: '_Tips-Train-EditTrainId-TrainNumberChange'
-            },
-            trainTypeChange: {
-                operation: '7022',
-                domId: '_Tips-Train-EditTrainId-trainTypeChange'
-            },
-            serverNoChange: {
-                operation: '7023',
-                domId: '_Tips-Train-EditTrainId-serverNoChange'
-            },
-            trainNoChange: {
-                operation: '7024',
-                domId: '_Tips-Train-EditTrainId-trainNoChange'
-            },
-            targetCodeChange: {
-                operation: '7025',
-                domId: '_Tips-Train-EditTrainId-targetCodeChange'
-            },
-            confirm: {
-                operation: '7026',
-                domId: '_Tips-Train-EditTrainId-Confirm'
-            },
-            input: {
-                operation: '7027',
-                domId: '_Tips-Train-EditTrainId-Input'
-            }
-        },
-        // 删除列车识别号
-        delTrainId: {
-            event: '3',
-            menu: {
-                operation: '703',
-                domId: '_Tips-Train-DelTrainId-Menu'
-            },
-            trainNumberChange: {
-                operation: '7031',
-                domId: '_Tips-Train-DelTrainId-TrainNumberChange'
-            },
-            confirm: {
-                operation: '7032',
-                domId: '_Tips-Train-DelTrainId-Confirm'
-            },
-            input: {
-                operation: '7033',
-                domId: '_Tips-Train-DelTrainId-Input'
-            }
-        },
-        // 移动列车识别号
-        moveTrainId: {
-            event: '4',
-            menu: {
-                operation: '704',
-                domId: '_Tips-Train-MoveTrainId-Menu'
-            },
-            confirm: {
-                operation: '7041',
-                domId: '_Tips-Train-MoveTrainId-Confirm'
-            }
-        },
-
-        // 交换列车识别号
-        switchTrainId: {
-            event: '5',
-            menu: {
-                operation: '705',
-                domId: '_Tips-Train-SwitchTrainId-Menu'
-            },
-            confirm: {
-                operation: '7051',
-                domId: '_Tips-Train-SwitchTrainId-Confirm'
-            }
-        },
-        // 修改车组号
-        editTrainNo: {
-            event: '6',
-            menu: {
-                operation: '706',
-                domId: '_Tips-Train-DditTrainNo-Menu'
-            },
-            confirm: {
-                operation: '7061',
-                domId: '_Tips-Train-DditTrainNo-Confirm'
-            }
-        },
-        // 限速行驶
-        limitSpeed: {
-            event: '7',
-            menu: {
-                operation: '707',
-                domId: '_Tips-Train-LimitSpeed-Menu'
-            }
-        },
-        // 设置计划车
-        setPlanTrainId: {
-            event: '8',
-            menu: {
-                operation: '708',
-                domId: '_Tips-Train-SetPlanTrainId-Menu'
-            },
-            confirm: {
-                operation: '7081',
-                domId: '_Tips-Train-SetPlanTrainId-Confirm'
-            },
-            trainSource: {
-                operation: '7082',
-                domId: '_Tips-Train-SetPlanTrainId-TrainSource'
-            }
-        },
-        // 添加计划车
-        addPlanTrainId: {
-            event: '9',
-            menu: {
-                operation: '709',
-                domId: '_Tips-Train-addPlanTrainId-Menu'
-            },
-            confirm: {
-                operation: '7091',
-                domId: '_Tips-Train-addPlanTrainId-Confirm'
-            },
-            trainSource: {
-                operation: '7092',
-                domId: '_Tips-Train-addPlanTrainId-TrainSource'
-            }
-        },
-        // 平移计划车
-        moveEventlyTrainId: {
-            event: 'a',
-            menu: {
-                operation: '70a',
-                domId: '_Tips-Train-moveEventlyTrainId-Menu'
-            },
-            confirm: {
-                operation: '70a1',
-                domId: '_Tips-Train-moveEventlyTrainId-Confirm'
-            },
-            trainSource: {
-                operation: '70a2',
-                domId: '_Tips-Train-moveEventlyTrainId-TrainSource'
-            }
-        },
-        // 删除计划车
-        deletePlanTrainId: {
-            event: 'b',
-            menu: {
-                operation: '70b',
-                domId: '_Tips-Train-deletePlanTrainId-Menu'
-            },
-            confirm: {
-                operation: '70b1',
-                domId: '_Tips-Train-deletePlanTrainId-Confirm'
-            },
-            trainSource: {
-                operation: '70b2',
-                domId: '_Tips-Train-deletePlanTrainId-TrainSource'
-            }
-        },
-        // 设目的地车
-        destinationTrainId: {
-            event: 'c',
-            menu: {
-                operation: '70c',
-                domId: '_Tips-Train-destinationTrainId-Menu'
-            }
-        },
-        // 设人工车
-        artificialTrainId: {
-            event: 'd',
-            menu: {
-                operation: '70d',
-                domId: '_Tips-Train-artificialTrainId-Menu'
-            }
-        }
-
-    },
-
-    // 取消全线临时限速
-    LimitControl: {
-        CancelAllLimit: {
-            event: '1',
-            menu: {
-                operation: '800',
-                domId: '_Tips-Cancel-Limit-All-Menu'
-            },
-            openMessage: {
-                operation: '8001',
-                domId: '_Tips-Cancel-Limit-open-message-Menu'
-            },
-            closeMessage: {
-                operation: '8002',
-                domId: '_Tips-Cancel-Limit-close-message-Menu'
-            },
-            confirm1: {
-                operation: '8003',
-                domId: '_Tips-Cancel-Limit-close-confirm1-Menu'
-            },
-            confirm2: {
-                operation: '8004',
-                domId: '_Tips-Cancel-Limit-close-confirm2-Menu'
-            },
-            confirm: {
-                operation: '8005',
-                domId: '_Tips-Cancel-Limit-confirm-Menu'
-            },
-            close: {
-                operation: '8006',
-                domId: '_Tips-Cancel-Limit-close-Menu'
-            }
-        }
-    },
-
-    // 混合指令
-    MixinCommand: {
-        /** 控制模式操作 */
-        remoteControl: {
-            mbar: {
-                operation: '2999',
-                domId: '_Tips-Control-StationControl-Mbar'
-            }
-        },
-        // 封锁
-        block: {
-            event: '90',
-            button: {
-                operation: '2991',
-                domId: '_Tips-Block-Button{TOP}'
-            }
-        },
-        // 解封
-        unblock: {
-            event: '91',
-            button: {
-                operation: '2992',
-                domId: '_Tips-Unblock-Button{TOP}'
-            }
-        },
-        // 功能按钮
-        functionButton: {
-            button: {
-                operation: '2993',
-                domId: '_Tips-FunctionButton-Button{TOP}'
-            }
-        }
-    }
-
-};
-
-/**
- * 根据OperationEvent字典生成DomIdOperationRel
- * @param {*}
- */
-export function generateDomIdOperationRel() {
-    const domIdOperationRel = {};
-    for (const deviceType in OperationEvent) {
-        for (const operate in OperationEvent[deviceType]) {
-            for (const orderType in OperationEvent[deviceType][operate]) {
-                if (OperationEvent[deviceType][operate][orderType].operation) {
-                    domIdOperationRel[OperationEvent[deviceType][operate][orderType].operation] = OperationEvent[deviceType][operate][orderType].domId;
-                }
-            }
-        }
-    }
-    return domIdOperationRel;
-}
-
-export const DomIdOperationRel = generateDomIdOperationRel();
-
-/**
- * 根据设备type和operation code获取操作分类
- * @param {*} deviceType
- * @param {*} operation
- */
-export function getOperateTypeBy(deviceType, operation) {
-    if (OperationEvent[deviceType]) {
-        for (var operate in OperationEvent[deviceType]) {
-            for (var orderType in OperationEvent[deviceType][operate]) {
-                if (OperationEvent[deviceType][operate][orderType] &&
-					OperationEvent[deviceType][operate][orderType].operation === operation) {
-                    return OperationEvent[deviceType][operate][orderType].operation;
-                }
-            }
-        }
-    }
-    return null;
-}
-
-/**
- * 根据操作类型获取地图菜单按钮domId
- * @param {*} operation
- */
-export function getDomIdByOperation(operation) {
-    let domIdDict = DomIdOperationRel;
-    if (!domIdDict) {
-        domIdDict = generateDomIdOperationRel();
-    }
-    return domIdDict[operation];
-}
-
-/**
- * 根据操作类型和操作原子判断是否属于该原子
- */
-export function checkOperationIsCurrentOperate(operation, operate) {
-    for (const order in operate) {
-        if (operate[order] &&
-			operate[order].operation === operation) {
-            return true;
-        }
-    }
-}
-/**
- * ibp操作
- */
+/** ibp操作*/
 export const IbpOperation = {
-    // Up_Hold_Train: {operate: '01', event: 'UpHoldTrain'},
-    // Up_Cancel_Hold_Train: {operate: '02', event: 'UpCancelHoldTrain'},
-    // Down_Hold_Train: {operate: '03', event: 'DownHoldTrain'},
-    // Down_Cancel_Hold_Train: {operate: '04', event: 'DownCancelHoldTrain'},
-    // Up_Open_Screen_Door: {operate: '05', event: 'UpOpenScreenDoor'},
-    // Down_Open_Screen_Door: {operate: '06', event: 'DownOpenScreenDoor'},
-    // Ban_Up_Open_Screen_Door: {operate: '', event: 'BanUpOpenScreenDoor'},
-    // Ban_Down_Open_Screen_Door: {operate: '', event: 'BanDownOpenScreenDoor'}
     XXKC: {operate: '01', event: 'XXKC', name: '下行扣车'},
     XXZZKC: {operate: '02', event: 'XXZZKC', name: '下行终止扣车'},
     SXKC: {operate: '03', event: 'SXKC', name: '上行扣车'},
@@ -2277,6 +177,7 @@ export const UrlConfig = {
         lessonTraining: '/design/lesson/training',
         trainingRecord: '/design/lesson/training',
         runPlan: '/design/runPlan/detail',
+        testRunPlan: '/design/runPlan/testRunplan',
         scriptHome: '/design/script/home',
         display: '/design/display',
         displayNew: '/design/displayNew',
diff --git a/src/scripts/FaultDic.js b/src/scripts/FaultDic.js
deleted file mode 100644
index f418ad557..000000000
--- a/src/scripts/FaultDic.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const FaultStatusEnum = {
-    Section: {
-        '01': '占用'
-    },
-    Switch: {
-
-    },
-    Signal: {
-
-    },
-    Station: {
-
-    },
-    StationControl: {
-
-    },
-    StationDelayUnlock: {
-
-    },
-    StationStand: {
-
-    },
-    Train: {
-
-    },
-    TrainWindow: {
-    }
-};
diff --git a/src/scripts/ProjectConfig.js b/src/scripts/ProjectConfig.js
index e10d7eb89..af834b0a7 100644
--- a/src/scripts/ProjectConfig.js
+++ b/src/scripts/ProjectConfig.js
@@ -408,6 +408,7 @@ export const MainBodyNoShow = ['heb', 'designheb', 'jyd', 'designjyd', 'tky', 'd
 export const GenerateRouteProjectList = ['jsxt', 'refereeJsxt'];// 需要在公共路由中生成登录页面的项目
 export const ProjectLoginStyleList = ['jsxt', 'refereeJsxt', 'gzb', 'designgzb', 'xty', 'designxty', 'xadt', 'designxadt', 'tky', 'designtky', 'jyd', 'designjyd', 'bxkc', 'designbxkc', 'crsc', 'designcrsc', 'hls', 'designhls', 'drts', 'hyd', 'designhyd', 'nty', 'designnty', 'bjd', 'designbjd']; // 登录页样式
 export const NoQrcodeList = ['heb', 'designheb'];
+export const NoSimulationQrCodeList = ['heb', 'bjd'];
 export const goOtherPlatformMenu = { // 导航栏快速切换平台
     login: '/design/login',
     design: '/login',
@@ -446,3 +447,7 @@ export const ProjectList = [
     {value: 'bjd', label: '北交大'},
     {value: 'urtss', label: '陪标项目'}
 ];
+export const ProjectPostIdMap = {
+    drts: 1,
+    bjd: 2
+};
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 1f6099519..314af2d89 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -604,6 +604,13 @@ export const OperationEvent = {
                 operation: '1182',
                 domId: '_Tips-Switch-Hook-Lock-Confirm'
             }
+        },
+        // 引导总锁
+        guideLock: {
+            button: {
+                operation: '1190',
+                domId: '_Tips-Switch-GuideLock-Button{TOP}'
+            }
         }
     },
 
diff --git a/src/scripts/plugin/CommandEnum.js b/src/scripts/plugin/CommandEnum.js
deleted file mode 100644
index 1705aa522..000000000
--- a/src/scripts/plugin/CommandEnum.js
+++ /dev/null
@@ -1,174 +0,0 @@
-export default {
-    Switch: {
-        /** 设置故障 */
-        CMD_SWITCH_ADD_FAULT: {value:'Switch_Add_Fault', label: '设置道岔故障'},
-        /** 清除故障 */
-        CMD_SWITCH_REMOVE_FAULT: {value:'Switch_Remove_Fault', label: '清除道岔故障'},
-        /** 单锁 */
-        CMD_SWITCH_SINGLE_LOCK: {value:'Switch_Single_Lock', label: '单锁'},
-        /** 单解 */
-        CMD_SWITCH_SINGLE_UNLOCK: {value:'Switch_Single_Unlock', label: '单解'},
-        /** 封锁 */
-        CMD_SWITCH_BLOCK: {value:'Switch_Block', label: '封锁'},
-        /** 解封 */
-        CMD_SWITCH_UNBLOCK: {value:'Switch_Unblock', label: '解封'},
-        /** 切除 */
-        CMD_SWITCH_CUT_OFF: {value:'Switch_Cut_Off', label: '切除'},
-        /** 激活 */
-        CMD_SWITCH_ACTIVE: {value:'Switch_Active', label: '激活'},
-        /** 设置临时限速 */
-        CMD_SWITCH_SET_LIMIT_SPEED: {value:'Switch_Set_Limit_Speed', label: '设置临时限速'},
-        /** 取消临时限速 */
-        CMD_SWITCH_CANCEL_LIMIT_SPEED: {value:'Switch_Cancel_Limit_Speed', label: '取消临时限速'},
-        /** 计轴预复位 */
-        CMD_SWITCH_AXIS_PRE_RESET: {value:'Switch_Axis_Pre_Reset', label: '计轴预复位'},
-        /** 故障解锁 */
-        CMD_SWITCH_FAULT_UNLOCK: {value:'Switch_Fault_Unlock', label: '故障解锁'},
-        /** 转动 */
-        CMD_SWITCH_TURN: {value:'Switch_Turn', label: '转动'},
-        /** 强扳 */
-        CMD_SWITCH_FORCE_TURN: {value:'Switch_Force_Turn', label: '强扳'}
-    },
-
-    // 控制模式操作
-    StationControl: {
-        /** 请求站控 */
-        CMD_CM_APPLY_FOR_STATION_CONTROL: {value:'CM_Apply_For_Station_Control', label: '请求站控'},
-        /** 请求中控 */
-        CMD_CM_APPLY_FOR_CENTER_CONTROL: {value:'CM_Apply_For_Center_Control', label: '请求中控'},
-        /** 强制站控 */
-        CMD_CM_FORCE_STATION_CONTROL: {value:'CM_Force_Station_Control', label: '强制站控'},
-        /** 紧急站控 */
-        CMD_CM_EMERGENCY_STATION_CONTROL: {value:'CM_Emergency_Station_Control', label: '紧急站控'},
-        /** 回复站控请求（同意/拒绝） */
-        CMD_CM_REPLY_STATION_CONTROL: {value:'CM_Reply_Station_Control', label: '回复站控请求'},
-        /** 回复中控请求（同意/拒绝） */
-        CMD_CM_REPLY_CENTER_CONTROL: {value:'CM_Reply_Center_Control', label: '回复中控请求'}
-
-    },
-
-    // 信号机操作
-    Signal: {
-        /** 设置故障 */
-        CMD_SIGNAL_ADD_FAULT: {value:'Signal_Add_Fault', label: '设置信号机故障'},
-        /** 清除故障 */
-        CMD_SIGNAL_REMOVE_FAULT: {value:'Signal_Remove_Fault', label: '清除信号机故障'},
-        /** 封锁 */
-        CMD_SIGNAL_BLOCK: {value:'Signal_Block', label: '封锁'},
-        /** 解封 */
-        CMD_SIGNAL_UNBLOCK: {value:'Signal_Unblock', label: '解封'},
-        /** 排列进路 */
-        CMD_SIGNAL_SET_ROUTE: {value:'Signal_Set_Route', label: '排列进路'},
-        /** 取消进路 */
-        CMD_SIGNAL_CANCEL_ROUTE: {value:'Signal_Cancel_Route', label: '取消进路'},
-        /** 人解进路 */
-        CMD_SIGNAL_HUMAN_RELEASE_ROUTE: {value:'Signal_Human_Release_Route', label: '人解进路'},
-        /** 信号关灯 */
-        CMD_SIGNAL_CLOSE_SIGNAL: {value:'Signal_Close_Signal', label: '信号关灯'},
-        /** 信号重开 */
-        CMD_SIGNAL_REOPEN_SIGNAL: {value:'Signal_Reopen_Signal', label: '信号重开'},
-        /** 引导进路 */
-        CMD_SIGNAL_ROUTE_GUIDE: {value:'Signal_Route_Guide', label: '引导进路'},
-        /** 进路自排开 */
-        CMD_SIGNAL_OPEN_AUTO_SETTING: {value:'Signal_Open_Auto_Setting', label: '进路自排开'},
-        /** 进路自排关 */
-        CMD_SIGNAL_CLOSE_AUTO_SETTING: {value:'Signal_Close_Auto_Setting', label: '进路自排关'},
-        /** 设置联锁自动进路*/
-        CMD_SIGNAL_SET_CI_AUTO: {value:'Signal_Set_CI_Auto', label: '设置联锁自动进路'},
-        /** 取消联锁自动进路*/
-        CMD_SIGNAL_CANCEL_CI_AUTO: {value:'Signal_Cancel_CI_Auto', label: '取消联锁自动进路'},
-        /** 设置联锁自动触发 */
-        CMD_SIGNAL_SET_CI_AUTO_TRIGGER: {value:'Signal_Set_CI_Auto_Trigger', label: '设置联锁自动触发'},
-        /** 取消联锁自动触发 */
-        CMD_SIGNAL_CANCEL_CI_AUTO_TRIGGER: {value:'Signal_Cancel_CI_Auto_Trigger', label: '取消联锁自动触发'}
-    },
-
-    // 物理区段操作
-    Section: {
-        /** 设置故障 */
-        CMD_SECTION_ADD_FAULT: {value:'Section_Add_Fault', label: '设置区段故障'},
-        /** 清除故障 */
-        CMD_SECTION_REMOVE_FAULT: {value:'Section_Remove_Fault', label: '清除区段故障'},
-        /** 封锁 */
-        CMD_SECTION_BLOCK: {value:'Section_Block', label: '封锁'},
-        /** 解封 */
-        CMD_SECTION_UNBLOCK: {value:'Section_Unblock', label: '解封'},
-        /** 切除 */
-        CMD_SECTION_CUT_OFF: {value:'Section_Cut_Off', label: '切除'},
-        /** 激活 */
-        CMD_SECTION_ACTIVE: {value:'Section_Active', label: '激活'},
-        /** 设置临时限速 */
-        CMD_SECTION_SET_LIMIT_SPEED: {value:'Section_Set_Limit_Speed', label: '设置临时限速'},
-        /** 计轴预复位 */
-        CMD_SECTION_AXIS_PRE_RESET: {value:'Section_Axis_Pre_Reset', label: '计轴预复位'},
-        /** 故障解锁 */
-        CMD_SECTION_FAULT_UNLOCK: {value:'Section_Fault_Unlock', label: '故障解锁'},
-        /** 取消临时限速 */
-        CMD_SECTION_CANCEL_LIMIT_SPEED:{value:'Section_Cancel_Limit_Speed', label: '取消临时限速'}
-    },
-
-    // 站台
-    StationStand: {
-        /** 设置故障 */
-        CMD_STAND_ADD_FAULT: {value:'Stand_Add_Fault', label: '设置站台故障'},
-        /** 清除故障 */
-        CMD_STAND_REMOVE_FAULT: {value:'Stand_Remove_Fault', label: '清除站台故障'},
-        /** 设置跳停 */
-        CMD_STAND_SET_JUMP_STOP: {value:'Stand_Set_Jump_Stop', label: '设置跳停'},
-        /** 取消跳停 */
-        CMD_STAND_CANCEL_JUMP_STOP: {value:'Stand_Cancel_Jump_Stop', label: '取消跳停'},
-        /** 设置扣车 */
-        CMD_STAND_SET_HOLD_TRAIN: {value:'Stand_Set_Hold_Train', label: '设置扣车'},
-        /** 取消扣车 */
-        CMD_STAND_CANCEL_HOLD_TRAIN: {value:'Stand_Cancel_Hold_Train', label: '取消扣车'},
-        /** 强制取消扣车 */
-        CMD_STAND_FORCE_CANCEL_HOLD_TRAIN: {value:'Stand_Force_Cancel_Hold_Train', label: '强制取消扣车'},
-        /** 全线取消扣车 */
-        CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN: {value:'Stand_Whole_Line_Cancel_Hold_Train', label: '全线取消扣车'},
-        /** 提前发车 */
-        CMD_STAND_EARLY_DEPART: {value:'Stand_Early_Depart', label: '提前发车'},
-        /** 设置停站时间 */
-        CMD_STAND_SET_PARK_TIME: {value:'Stand_Set_Park_Time', label: '设置停站时间'},
-        /** 设置站间运行时间（设置运行等级） */
-        CMD_STAND_SET_RUN_TIME: {value:'Stand_Set_Run_Time', label: '设置站间运行时间'},
-        /** 设置折返策略 */
-        CMD_STAND_SET_REENTRY_STRATEGY: {value:'Stand_Set_Reentry_Strategy', label: '设置折返策略'},
-        /** 查看站台状态 */
-        CMD_STAND_VIEW_STATUS:{value:'Stand_View_Status', label: '查看站台状态'}
-    },
-
-    Station: {
-        /** 设置故障 */
-        CMD_STATION_ADD_FAULT: {value:'Station_Add_Fault', label: '设置车站故障'},
-        /** 清除故障 */
-        CMD_STATION_REMOVE_FAULT: {value:'Station_Remove_Fault', label: '清除车站故障'},
-        /** 全站设置联锁自动触发 */
-        CMD_STATION_SET_CI_AUTO_TRIGGER: {value:'Station_Set_CI_Auto_Trigger', label: '全站设置联锁自动触发'},
-        /** 全站取消联锁自动触发 */
-        CMD_STATION_CANCEL_CI_AUTO_TRIGGER: {value:'Station_Cancel_CI_Auto_Trigger', label: '全站取消联锁自动触发'},
-        /** 所有进路自排开 */
-        CMD_STATION_OPEN_AUTO_SETTING: {value:'Station_Open_Auto_Setting', label: '所有进路自排开'},
-        /** 所有进路自排关 */
-        CMD_STATION_CLOSE_AUTO_SETTING: {value:'Station_Close_Auto_Setting', label: '所有进路自排关'}
-    },
-
-    // 列车
-    Train: {
-        /** 设置故障 */
-        CMD_TRAIN_ADD_FAULT: {value:'Train_Add_Fault', label: '设置列车故障'},
-        /** 清除故障 */
-        CMD_TRAIN_REMOVE_FAULT: {value:'Train_Remove_Fault', label: '清除列车故障'},
-        /** 人工限速行驶 */
-        CMD_TRAIN_MANUAL_LIMIT_DRIVE: {value:'Train_Manual_Limit_Drive', label: '人工限速行驶'},
-        /** 按进路闭塞法行车 */
-        CMD_TRAIN_MANUAL_ROUTE_BLOCKING_DRIVE: {value:'Train_Manual_Route_Blocking_Drive', label: '按进路闭塞法行车'},
-        /** 越信号机红灯 */
-        CMD_TRAIN_PASS_RED_SIGNAL: {value:'Train_Pass_Red_Signal', label: '越信号机红灯'},
-        /** 引导信号行车 */
-        CMD_TRAIN_DRIVE_BY_GUIDE_SIGNAL: {value:'Train_Drive_By_Guide_Signal', label: '引导信号行车'}
-    },
-
-    LimitControl: {
-
-    }
-};
diff --git a/src/scripts/plugin/Converter/CancelLimitOperationConverter.js b/src/scripts/plugin/Converter/CancelLimitOperationConverter.js
deleted file mode 100644
index 0cd743480..000000000
--- a/src/scripts/plugin/Converter/CancelLimitOperationConverter.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const CancelLimitOperation = OperationEvent.LimitControl;
-
-const CancelLimitType = MapDeviceType.LimitControl.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('LimitControl', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case CancelLimitOperation.CancelAllLimit.menu.operation: return handleMenuCancelAllLimit(operates);
-
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelAllLimit(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === CancelLimitType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: CancelLimitOperation.CancelAllLimit.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/MixinOperationConverter.js b/src/scripts/plugin/Converter/MixinOperationConverter.js
deleted file mode 100644
index cef109501..000000000
--- a/src/scripts/plugin/Converter/MixinOperationConverter.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import { MapDeviceType, OperationEvent, getOperateTypeBy, checkOperationIsCurrentOperate } from '@/scripts/ConstDic';
-import { handleMenuRequestCentralControl, handleMenuRequestStationControl, handleMenuEmergencyStationControl } from './StationControlOperationConverter';
-// import { handleButtonLock } from './SignalRouteOperationConverter.js';
-// import { handleMenuRequestCentralControl } from './SwitchOperationConverter.js';
-
-const MixinCommandOperation = OperationEvent.MixinCommand;
-const StationControlOperation = OperationEvent.StationControl;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('MixinCommand', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            switch (operates[0].operation) {
-            case MixinCommandOperation.remoteControl.mbar.operation: return handleMenuRemoteControl(operates);
-            case MixinCommandOperation.block.button.operation: return handleBlockButton(operates);
-            case MixinCommandOperation.unblock.button.operation: return handleUnblockButton(operates);
-			// case MixinCommandOperation.remoteControl.mbar.operation: return handleMenuRemoteControl(operates);
-			// case MixinCommandOperation.remoteControl.mbar.operation: return handleMenuRemoteControl(operates);
-            }
-        }
-    }
-};
-
-/**
- * 控制模式操作
- */
-function handleMenuRemoteControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (checkOperationIsCurrentOperate(operate.operation, StationControlOperation.requestStationControl)) {
-            return handleMenuRequestCentralControl(operates);
-        } else if (checkOperationIsCurrentOperate(operate.operation, StationControlOperation.requestCentralControl)) {
-            return handleMenuRequestStationControl(operates);
-        } else if (checkOperationIsCurrentOperate(operate.operation, StationControlOperation.emergencyStationControl)) {
-            return handleMenuEmergencyStationControl(operates);
-        }
-
-        return { error: true };
-    }
-    return null;
-}
-
-// 封锁操作
-function handleBlockButton(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type == MapDeviceType.Signal.type) { // 信号机 封锁
-            return handleButtonLock(operate);
-        } else if (operate.type == MapDeviceType.Switch.type) { // 道岔封锁
-            return handleButtonBlock(operate);
-        }
-        return { error: true };
-    }
-    return null;
-}
-// 信号封锁 按钮操作
-function handleButtonLock(operate) {
-    if (operate.code) {
-        return {
-            type: operate.type,
-            code: operate.code,
-            over: true,
-            operation: OperationEvent.Signal.lock.event
-        };
-    }
-    return { error: true };
-}
-
-//  信号机解封 按钮操作
-function handleButtonUnlock(operate) {
-    if (operate.code) {
-        return {
-            type: operate.type,
-            code: operate.code,
-            over: true,
-            operation: OperationEvent.Signal.unlock.event
-        };
-    }
-    return { error: true };
-}
-
-// 道岔封锁 按钮操作
-function handleButtonBlock(operate) {
-    if (operate.code) {
-        return {
-            type: operate.type,
-            code: operate.code,
-            over: true,
-            operation: OperationEvent.Switch.block.event
-        };
-    }
-    return { error: true };
-}
-
-// 道岔解封 按钮操作
-function handleButtonUnblock(operate) {
-    if (operate.code) {
-        return {
-            type: operate.type,
-            code: operate.code,
-            over: true,
-            operation: OperationEvent.Switch.unblock.event
-        };
-    }
-    return { error: true };
-}
-
-// 解封操作
-function handleUnblockButton(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type == MapDeviceType.Signal.type) { // 信号机 解封
-            return handleButtonUnlock(operate);
-        } else if (operate.type == MapDeviceType.Switch.type) { // 道岔封锁
-            return handleButtonUnblock(operate);
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/SectionOperationConverter.js b/src/scripts/plugin/Converter/SectionOperationConverter.js
deleted file mode 100644
index 5ef818977..000000000
--- a/src/scripts/plugin/Converter/SectionOperationConverter.js
+++ /dev/null
@@ -1,437 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-import localStore from 'storejs';
-import store from '@/store/index_APP_TARGET';
-
-const SectionOperation = OperationEvent.Section;
-
-const SectionType = MapDeviceType.Section.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('Section', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case SectionOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case SectionOperation.stoppage.menu.operation: return handleMenuFailure(operates);
-
-            case SectionOperation.alxeFailure.menu.operation: return handleMenuAlxeFailure(operates);
-
-            case SectionOperation.fault.menu.operation: return handleMenuFault(operates);
-            case SectionOperation.fault.button.operation: return handleButtonFault(operates);
-
-            case SectionOperation.lock.menu.operation: return handleMenuLock(operates);
-
-            case SectionOperation.unlock.menu.operation: return handleMenuUnlock(operates);
-
-            case SectionOperation.split.menu.operation: return handleMenuSplit(operates);
-
-            case SectionOperation.active.menu.operation: return handleMenuActive(operates);
-
-            case SectionOperation.setSpeed.menu.operation: return handleMenuSetSpeed(operates);
-
-            case SectionOperation.cancelSpeed.menu.operation: return handleMenuCancelSpeed(operates);
-
-            case SectionOperation.axlePreReset.menu.operation: return handleMenuAxlePreReset(operates);
-            case SectionOperation.axlePreReset.button.operation: return handleButtonAxlePreReset(operates);
-
-            case SectionOperation.detail.menu.operation: return handleMenuDetail(operates);
-
-            case SectionOperation.newtrain.menu.operation: return handleMenuNewTrain(operates);
-
-            case SectionOperation.alxeEffective.menu.operation: return handleMenuAlxeEffective(operates);
-
-            case SectionOperation.setLimitSpeed.menu.operation: return handleMenuSetLimitSpeed(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置计轴失效 操作
- * @param {*} operates
- */
-function handleMenuFailure(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置计轴失效 操作
- * @param {*} operates
- */
-function handleMenuAlxeFailure(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.alxeFailure.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 区故解 操作
- * @param {*} operates
- */
-function handleMenuFault(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            if (operate.code) {
-                let val = '';
-                const counter = store.getters['map/getCounterBySectionCode'](operate.code, '01');
-                if (counter) {
-                    val = localStore.get(counter.code);
-                }
-
-                return {
-                    type: operate.type,
-                    code: operate.code,
-                    over: true,
-                    operation: SectionOperation.fault.event,
-                    val: val
-                };
-            }
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 封锁 操作
- * @param {*} operates
- */
-function handleMenuLock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.lock.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 解锁 操作
- * @param {*} operates
- */
-function handleMenuUnlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.unlock.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 切除 操作
- * @param {*} operates
- */
-function handleMenuSplit(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.split.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 激活 操作
- * @param {*} operates
- */
-function handleMenuActive(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.active.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置速度
- * @param {*} operates
- */
-
-function handleMenuSetSpeed(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.setSpeed.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消速度
- * @param {*} operates
- */
-
-function handleMenuCancelSpeed(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SectionOperation.cancelSpeed.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SectionType && operates[0].code) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SectionOperation.cancelSpeed.event.confirm
-            };
-        }
-        return { error: true };
-    }
-
-    return null;
-}
-
-/**
- * 处理右键菜单 区段预复位
- * @param {*} operates
- */
-
-function handleMenuAxlePreReset(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.axlePreReset.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 区段详细信息
- * @param {*} operates
- */
-
-function handleMenuDetail(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.detail.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 新建列车操作
- * @param {*} operates
- */
-function handleMenuNewTrain(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.newtrain.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置计轴有效操作
- * @param {*} operates
- */
-function handleMenuAlxeEffective(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.alxeEffective.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置临时限速操作
- * @param {*} operates
- */
-function handleMenuSetLimitSpeed(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.setLimitSpeed.event,
-                val: operates[operates.length - 1].val
-            };
-        } else if (operate.type === MapDeviceType.Switch.type && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.setLimitSpeed.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-}
-
-/**
- * 处理点击按钮 区故解 操作
- * @param {*} operates
- */
-function handleButtonFault(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                // over: true,
-                operation: SectionOperation.fault.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 计轴预复位 操作
- * @param {*} operates
- */
-function handleButtonAxlePreReset(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SectionType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SectionOperation.axlePreReset.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/SignalRouteOperationConverter.js b/src/scripts/plugin/Converter/SignalRouteOperationConverter.js
deleted file mode 100644
index daf3a1597..000000000
--- a/src/scripts/plugin/Converter/SignalRouteOperationConverter.js
+++ /dev/null
@@ -1,690 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-// import localStore from 'storejs';
-
-const SignalOperation = OperationEvent.Signal;
-
-const SignalType = MapDeviceType.Signal.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('Signal', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    /**
-	 * 验证前预处理
-	 */
-    preHandle: function (operates) {
-        if (operates && operates.length) {
-            const curOperate = operates[operates.length - 1];
-            switch (operates[0].operation) {
-            case SignalOperation.arrangementRoute.button: {
-                if (curOperate.model) {
-                    curOperate.val = curOperate.model._viewVal;
-                }
-                return curOperate;
-            }
-            case SignalOperation.cancelTrainRoute.button: {
-                if (curOperate.model) {
-                    curOperate.val = curOperate.model._viewVal;
-                }
-                return curOperate;
-            }
-            case SignalOperation.reopenSignal.button: {
-                return curOperate;
-            }
-            case SignalOperation.humanTrainRoute.button: {
-                if (curOperate.model) {
-                    curOperate.val = curOperate.model._viewVal;
-                }
-                return curOperate;
-            }
-            default: {
-                return curOperate;
-            }
-            }
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            switch (operates[0].operation) {
-            case SignalOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case SignalOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case SignalOperation.arrangementRoute.button.operation: return handleButtonArrangementRoute(operates); // 排列进路按钮操作
-            case SignalOperation.arrangementRoute.menu.operation: return handleMenuArrangementRoute(operates);
-
-            case SignalOperation.cancelTrainRoute.button.operation: return handleButtonCancelTrainRoute(operates); // 取消进路按钮操作
-            case SignalOperation.cancelTrainRoute.menu.operation: return handleMenuCancelTrainRoute(operates);
-
-            case SignalOperation.reopenSignal.button.operation: return handleButtonReopenSignal(operates); // 信号重开按钮操作
-            case SignalOperation.reopenSignal.menu.operation: return handleMenuReopenSignal(operates);
-
-            case SignalOperation.humanTrainRoute.button.operation: return handleButtonHumanTrainRoute(operates); // 人解列车进路按钮操作
-            case SignalOperation.humanTrainRoute.menu.operation: return handleMenuHumanTrainRoute(operates);
-
-            case SignalOperation.lock.menu.operation: return handleMenuLock(operates);
-
-            case SignalOperation.unlock.menu.operation: return handleMenuUnlock(operates);
-
-            case SignalOperation.guide.menu.operation: return handleMenuGuideRoute(operates);
-            case SignalOperation.guide.button.operation: return handleButtonGuideRoute(operates); // 引导进路按钮操作
-
-            case SignalOperation.signalClose.menu.operation: return handleMenuSignalClose(operates);
-
-            case SignalOperation.setAutoInterlock.menu.operation: return handleMenuSetAutoInterlock(operates);
-            case SignalOperation.setAutoInterlock.button.operation: return handleButtonSetAutoInterlock(operates); // 设置联锁自动进路按钮
-
-            case SignalOperation.cancelAutoInterlock.menu.operation: return handleMenuCancelAutoInterlock(operates);
-
-            case SignalOperation.setAutoTrigger.menu.operation: return handleMenuSetAutoTrigger(operates);
-
-            case SignalOperation.cancelAutoTrigger.menu.operation: return handleMenuCancelAutoTrigger(operates);
-
-            case SignalOperation.humanControl.menu.operation: return handleMenuHumanControl(operates);
-            case SignalOperation.humanControl.button.operation: return handleButtonHumanControl(operates); // 人工控按钮操作
-
-            case SignalOperation.atsAutoControl.menu.operation: return handleMenuAtsAutoControl(operates);
-            case SignalOperation.atsAutoControl.button.operation: return handleButtonAtsAutoControl(operates); // 自动控按钮操作
-
-            case SignalOperation.detail.menu.operation: return handleMenuDetail(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理点击按钮 排列进路 操作
- * @param {*} operates
- */
-function handleButtonArrangementRoute(operates) {
-    if (operates.length === 2) {
-        const operate = operates[1];
-        if (operate.type == SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.arrangementRoute.event.query
-                // val: operate.model._viewVal
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        const operateBeg = operates[1]; // 起始信号灯
-        const operateEnd = operates[operates.length - 1]; // 终端信号灯
-        if (operateEnd.type == SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
-            for (let i = 0; i < operateEnd.tempData.length; i++) {
-                const elem = operateEnd.tempData[i];
-                if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
-                    return {
-                        type: operateEnd.type,
-                        code: operateEnd.code,
-                        over: true,
-                        operation: SignalOperation.arrangementRoute.event.confirm
-                        // val: elem.code
-                    };
-                }
-            }
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 排列进路 操作
- * @param {*} operates
- */
-function handleMenuArrangementRoute(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.arrangementRoute.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operates[0].code && (operates[operates.length - 2].val || operates[operates.length - 3].val)) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SignalOperation.arrangementRoute.event.confirm,
-                val: operates[operates.length - 2].val || operates[operates.length - 3].val
-            };
-        }
-        return { error: true };
-    }
-
-    return null;
-}
-
-/**
- * 处理点击按钮 取消进路 操作
- * @param {*} operates
- */
-function handleButtonCancelTrainRoute(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelTrainRoute.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 信号重开 操作
- * @param {*} operates
- */
-function handleButtonReopenSignal(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.reopenSignal.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 总人解 操作
- * @param {*} operates
- */
-function handleButtonHumanTrainRoute(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            if (operate.code) {
-                // const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
-                // if (counter) {
-                // const val = localStore.get(counter.code) || '';
-                return {
-                    type: operate.type,
-                    code: operate.code,
-                    over: true,
-                    operation: SignalOperation.humanTrainRoute.event
-                };
-                // }
-            }
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消进路 操作
- * @param {*} operates
- */
-function handleMenuCancelTrainRoute(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelTrainRoute.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 信号重开 操作
- * @param {*} operates
- */
-function handleMenuReopenSignal(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.reopenSignal.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 总人解 操作
- * @param {*} operates
- */
-function handleMenuHumanTrainRoute(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            if (operate.code) {
-                // const counter = store.getters['map/getCounterBySingalCode'](operate.code, '02');
-                // if (counter) {
-                // const val = localStore.get(counter.code) || '';
-                return {
-                    type: operate.type,
-                    code: operate.code,
-                    over: true,
-                    operation: SignalOperation.humanTrainRoute.event
-                    // val: val
-                };
-                // }
-            }
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 封锁 操作
- * @param {*} operates
- */
-function handleMenuLock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.lock.event
-            };
-        }
-        return { error: true };
-    }
-}
-
-/**
- * 处理右键菜单 解封 操作
- * @param {*} operates
- */
-function handleMenuUnlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.unlock.event
-            };
-        }
-        return { error: true };
-    }
-}
-
-/**
- * 处理右键菜单 引导 操作
- * @param {*} operates
- */
-function handleMenuGuideRoute(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.guide.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.guide.event.confirm
-            };
-        }
-        return { error: true };
-    }
-}
-
-/**
- * 处理右键菜单 信号关灯 操作
- * @param {*} operates
- */
-function handleMenuSignalClose(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.signalClose.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置联锁自动进路 操作
- * @param {*} operates
- */
-function handleMenuSetAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消联锁自动进路 操作
- * @param {*} operates
- */
-function handleMenuCancelAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置联锁自动触发 操作
- * @param {*} operates
- */
-function handleMenuSetAutoTrigger(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消联锁自动触发 操作
- * @param {*} operates
- */
-function handleMenuCancelAutoTrigger(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.cancelAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 进路交人工控 操作
- * @param {*} operates
- */
-function handleMenuHumanControl(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.humanControl.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        let val = null;
-        val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
-        val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
-        val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
-
-        if (operate.type === SignalType && operates[0].code && val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SignalOperation.humanControl.event.confirm,
-                val: val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-// 人工控按钮 操作
-function handleButtonHumanControl(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.humanControl.event.confirm
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 进路交ATS自动工控 操作
- * @param {*} operates
- */
-function handleMenuAtsAutoControl(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.atsAutoControl.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        let val = null;
-        val = operates[operates.length - 3] && operates[operates.length - 3].val ? operates[operates.length - 3].val : val;
-        val = operates[operates.length - 2] && operates[operates.length - 2].val ? operates[operates.length - 2].val : val;
-        val = operates[operates.length - 1] && operates[operates.length - 1].val ? operates[operates.length - 1].val : val;
-
-        if (operate.type === SignalType && operates[0].code && val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SignalOperation.atsAutoControl.event.confirm,
-                val: val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-// 自动控 按钮操作
-function handleButtonAtsAutoControl(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.atsAutoControl.event.confirm
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 查询进路状态 操作
- * @param {*} operates
- */
-function handleMenuDetail(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.detail.event.query
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 设置联锁自动进路 操作
- * @param {*} operates
- */
-function handleButtonSetAutoInterlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SignalOperation.setAutoInterlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 引导 操作
- * @param {*} operates
- */
-function handleButtonGuideRoute(operates) {
-    if (operates.length == 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SignalType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SignalOperation.guide.event.confirm
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        const operateBeg = operates[1];
-        const operateEnd = operates[operates.length - 1];
-        if (operateEnd.type === SignalType && operateEnd.code && operateEnd.tempData && operateEnd.tempData.length) {
-            for (let i = 0; i < operateEnd.tempData.length; i++) {
-                const elem = operateEnd.tempData[i];
-                if (elem.startSignalCode === operateBeg.code && elem.endSignalCode == operateEnd.code) {
-                    return {
-                        type: operateEnd.type,
-                        code: operateEnd.code,
-                        over: true,
-                        operation: SignalOperation.guide.event.confirm
-                    };
-                }
-            }
-        }
-        return { error: true };
-    }
-    return null;
-}
-
diff --git a/src/scripts/plugin/Converter/StationControlOperationConverter.js b/src/scripts/plugin/Converter/StationControlOperationConverter.js
deleted file mode 100644
index 98965f0cf..000000000
--- a/src/scripts/plugin/Converter/StationControlOperationConverter.js
+++ /dev/null
@@ -1,257 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const StationControlOperation = OperationEvent.StationControl;
-
-const StationControlType = MapDeviceType.StationControl.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('StationControl', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case StationControlOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case StationControlOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case StationControlOperation.emergencyStationControl.menu.operation: return handleMenuEmergencyStationControl(operates);
-
-            case StationControlOperation.requestStationControl.menu.operation: return handleMenuRequestStationControl(operates);
-            case StationControlOperation.requestStationControl.mbar.operation: return handleBarRequestStationControl(operates);
-
-            case StationControlOperation.forcedStationControl.menu.operation: return handleMenuForcedStationControl(operates);
-            case StationControlOperation.forcedStationControl.passwordConfirm.operation: return handleBarForcedStationControl(operates);
-            case StationControlOperation.forcedStationControl.mbar.operation: return handleBarForcedStationControl(operates);
-
-            case StationControlOperation.requestCentralControl.menu.operation: return handleMenuRequestCentralControl(operates);
-            case StationControlOperation.requestCentralControl.mbar.operation: return handleBarRequestCentralControl(operates);
-
-            case StationControlOperation.controlResponse.menu.operation: return handleMenuControlResponse(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-export function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationControlType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-export function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationControlType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 紧急站控 操作
- * @param {*} operates
- */
-export function handleMenuEmergencyStationControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                val: operate.val,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.emergencyStationControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 请求站控 操作
- * @param {*} operates
- */
-export function handleMenuRequestStationControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                val: operate.val,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.requestStationControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 强行站控 操作
- * @param {*} operates
- */
-export function handleMenuForcedStationControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                val: operate.val,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.forcedStationControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 请求中控 操作
- * @param {*} operates
- */
-export function handleMenuRequestCentralControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                val: operate.val,
-                code: operate.code,
-                over: true,
-                operation: StationControlOperation.requestCentralControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 控制模式应答 操作
- * @param {*} operates
- */
-export function handleMenuControlResponse(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            let operation = '';
-            if (operate.operation == StationControlOperation.controlResponse.agree.operation) {
-                if (operate.prdType == '01') {
-                    operation = StationControlOperation.controlResponse.event.stationAgree;
-                } else {
-                    operation = StationControlOperation.controlResponse.event.centralAgree;
-                }
-            } else {
-                if (operate.prdType == '01') {
-                    operation = StationControlOperation.controlResponse.event.stationRefuse;
-                } else {
-                    operation = StationControlOperation.controlResponse.event.centralRefuse;
-                }
-            }
-
-            return {
-                type: operate.type,
-                val: operate.val,
-                code: operate.code,
-                over: true,
-                operation: operation
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 请求站控 操作
- * @param {*} operates
- */
-export function handleBarRequestStationControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                operation: StationControlOperation.requestStationControl.event,
-                code: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 强制站控 操作
- * @param {*} operates
- */
-export function handleBarForcedStationControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationControlOperation.forcedStationControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 请求中控 操作
- * @param {*} operates
- */
-export function handleBarRequestCentralControl(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationControlType && operate.val) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationControlOperation.requestCentralControl.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/StationOperationConverter.js b/src/scripts/plugin/Converter/StationOperationConverter.js
deleted file mode 100644
index 959834c69..000000000
--- a/src/scripts/plugin/Converter/StationOperationConverter.js
+++ /dev/null
@@ -1,199 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const StationOperation = OperationEvent.Station;
-
-const StationType = MapDeviceType.Station.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('Station', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case StationOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case StationOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case StationOperation.setAutoTrigger.menu.operation: return handleMenuSetAutoTrigger(operates);
-
-            case StationOperation.cancelAutoTrigger.menu.operation: return handleMenuCancelAutoTrigger(operates);
-
-            case StationOperation.powerUnLock.menu.operation: return handleMenuPowerUnLock(operates);
-
-            case StationOperation.execKeyOperationTest.menu.operation: return handleMenuExecKeyOperationTest(operates);
-
-            case StationOperation.humanControlALL.menu.operation: return handleMenuHumanControlAll(operates);
-
-            case StationOperation.atsAutoControlALL.menu.operation: return handleMenuAtsAutoControlAll(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 全站设置联锁自动触发 操作
- * @param {*} operates
- */
-function handleMenuSetAutoTrigger(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.setAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 全站取消联锁自动触发 操作
- * @param {*} operates
- */
-function handleMenuCancelAutoTrigger(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.cancelAutoTrigger.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 上电解锁 操作
- * @param {*} operates
- */
-function handleMenuPowerUnLock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.powerUnLock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 执行关键操作测试 操作
- * @param {*} operates
- */
-function handleMenuExecKeyOperationTest(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.execKeyOperationTest.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 所有进路自排关 操作
- * @param {*} operates
- */
-function handleMenuHumanControlAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationOperation.humanControlALL.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 所有进路自排开 操作
- * @param {*} operates
- */
-function handleMenuAtsAutoControlAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationType && operates[0].code) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationOperation.atsAutoControlALL.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/StationStandOperationConverter.js b/src/scripts/plugin/Converter/StationStandOperationConverter.js
deleted file mode 100644
index ce5ec1ae2..000000000
--- a/src/scripts/plugin/Converter/StationStandOperationConverter.js
+++ /dev/null
@@ -1,436 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const StationStandOperation = OperationEvent.StationStand;
-
-const StationStandType = MapDeviceType.StationStand.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('StationStand', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case StationStandOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case StationStandOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case StationStandOperation.earlyDeparture.menu.operation: return handleMenuEarlyDeparture(operates);
-
-            case StationStandOperation.setJumpStop.menu.operation: return handleMenuSetJumpStop(operates);
-
-            case StationStandOperation.cancelJumpStop.menu.operation: return handleMenuCancelJumpStop(operates);
-
-            case StationStandOperation.setDetainTrain.menu.operation: return handleMenuSetDetainTrain(operates);
-
-            case StationStandOperation.cancelDetainTrain.menu.operation: return handleMenuCancelDetainTrain(operates);
-
-            case StationStandOperation.cancelDetainTrainForce.menu.operation: return handleMenuCancelDetainTrainForce(operates);
-
-            case StationStandOperation.detail.menu.operation: return handleMenuDetail(operates);
-
-            case StationStandOperation.cancelDetainTrainAll.menu.operation: return handleMenuCancelDetainTrainAll(operates);
-
-            case StationStandOperation.setStopTime.menu.operation: return handleMenuSetStopTime(operates);
-
-            case StationStandOperation.setRunLevel.menu.operation: return handleMenuSetRunLevel(operates);
-
-            case StationStandOperation.setBackStrategy.menu.operation: return handleMenuSetBackStrategy(operates);
-
-            case StationStandOperation.setDetainTrainAll.mbar.operation: return handleMbarSetDetainTrainAll(operates);
-
-            case StationStandOperation.cancelDetainTrainAll.mbar.operation: return handleMbarCancelDetainTrainAll(operates);
-
-            case StationStandOperation.cancelUpDetainTrainAll.mbar.operation: return handleMbarCancelUpDetainTrainAll(operates);
-
-            case StationStandOperation.cancelDownDetainTrainAll.mbar.operation: return handleMbarCancelDownDetainTrainAll(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationStandType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationStandOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: StationStandOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 提前发车 操作
- * @param {*} operates
- */
-function handleMenuEarlyDeparture(operates) {
-    if (operates.length > 0) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.earlyDeparture.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置跳停 操作
- * @param {*} operates
- */
-function handleMenuSetJumpStop(operates) {
-    if (operates.length > 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.setJumpStop.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消跳停 操作
- * @param {*} operates
- */
-function handleMenuCancelJumpStop(operates) {
-    if (operates.length > 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.cancelJumpStop.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置扣车 操作
- * @param {*} operates
- */
-function handleMenuSetDetainTrain(operates) {
-    if (operates.length > 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.setDetainTrain.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消扣车 操作
- * @param {*} operates
- */
-function handleMenuCancelDetainTrain(operates) {
-    if (operates.length > 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                // operation: operate.operation,
-                operation: StationStandOperation.cancelDetainTrain.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 强制取消扣车 操作
- * @param {*} operates
- */
-function handleMenuCancelDetainTrainForce(operates) {
-    if (operates.length > 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.cancelDetainTrainForce.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 站台详细信息 操作
- * @param {*} operates
- */
-function handleMenuDetail(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.detail.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消全站扣车 操作
- * @param {*} operates
- */
-function handleMenuCancelDetainTrainAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: StationStandOperation.cancelDetainTrainAll.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置停站时间 操作
- * @param {*} operates
- */
-function handleMenuSetStopTime(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === StationStandType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: StationStandOperation.setStopTime.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType && operate.val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: StationStandOperation.setStopTime.event.confirm,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-
-    return null;
-}
-
-/**
- * 处理右键菜单 设置运行等级 操作
- * @param {*} operates
- */
-function handleMenuSetRunLevel(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === StationStandType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: StationStandOperation.setRunLevel.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType && operate.val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: StationStandOperation.setRunLevel.event.confirm,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 提前发车 操作
- * @param {*} operates
- */
-function handleMenuSetBackStrategy(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === StationStandType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: StationStandOperation.setBackStrategy.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType && operate.val) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: StationStandOperation.setBackStrategy.event.confirm,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 设置全线扣车 操作
- * @param {*} operates
- */
-function handleMbarSetDetainTrainAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationStandOperation.setDetainTrainAll.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 取消全线扣车 操作
- * @param {*} operates
- */
-function handleMbarCancelDetainTrainAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationStandOperation.cancelDetainTrainAll.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 取消全线上行扣车 操作
- * @param {*} operates
- */
-function handleMbarCancelUpDetainTrainAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationStandOperation.cancelUpDetainTrainAll.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理菜单栏 取消全线上行扣车 操作
- * @param {*} operates
- */
-function handleMbarCancelDownDetainTrainAll(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === StationStandType) {
-            return {
-                type: operate.type,
-                code: operate.val,
-                operation: StationStandOperation.cancelDownDetainTrainAll.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/SwitchOperationConverter.js b/src/scripts/plugin/Converter/SwitchOperationConverter.js
deleted file mode 100644
index ef7728cc9..000000000
--- a/src/scripts/plugin/Converter/SwitchOperationConverter.js
+++ /dev/null
@@ -1,492 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const SwitchOperation = OperationEvent.Switch;
-
-const SwitchType = MapDeviceType.Switch.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('Switch', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case SwitchOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case SwitchOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case SwitchOperation.locate.button.operation: return handleButtonLocate(operates);
-            case SwitchOperation.locate.menu.operation: return handleMenuLocate(operates);
-
-            case SwitchOperation.reverse.button.operation: return handleButtonReverse(operates);
-            case SwitchOperation.reverse.menu.operation: return handleMenuReverse(operates);
-
-            case SwitchOperation.lock.button.operation: return handleButtonLock(operates);
-            case SwitchOperation.lock.menu.operation: return handleMenuLock(operates);
-
-            case SwitchOperation.unlock.button.operation: return handleButtonUnlock(operates);
-            case SwitchOperation.unlock.menu.operation: return handleMenuUnlock(operates);
-
-            case SwitchOperation.block.menu.operation: return handleMenuBlock(operates);
-
-            case SwitchOperation.unblock.menu.operation: return handleMenuUnblock(operates);
-
-            case SwitchOperation.turnout.menu.operation: return handleMenuTurnout(operates);
-
-            case SwitchOperation.turnoutForce.menu.operation: return handleMenuTurnoutForce(operates);
-
-            case SwitchOperation.fault.menu.operation: return handleMenuFault(operates);
-
-            case SwitchOperation.axlePreReset.menu.operation: return handleMenuAxlePreReset(operates);
-
-            case SwitchOperation.split.menu.operation: return handleMenuSplit(operates);
-
-            case SwitchOperation.active.menu.operation: return handleMenuActive(operates);
-
-            case SwitchOperation.setSpeed.menu.operation: return handleMenuSetSpeed(operates);
-
-            case SwitchOperation.cancelSpeed.menu.operation: return handleMenuCancelSpeed(operates);
-
-            case SwitchOperation.alxeEffective.menu.operation: return handleMenuAlxeEffective(operates);
-            }
-        }
-    }
-};
-
-/**
- * 处理点击按钮 定操 操作
- * @param {*} operates
- */
-function handleButtonLocate(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.locate.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 反操 操作
- * @param {*} operates
- */
-function handleButtonReverse(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.reverse.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 单锁 操作
- * @param {*} operates
- */
-function handleButtonLock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.lock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理点击按钮 解锁 操作
- * @param {*} operates
- */
-function handleButtonUnlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.unlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 定位 操作
- * @param {*} operates
- */
-function handleMenuLocate(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.locate.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 反位 操作
- * @param {*} operates
- */
-function handleMenuReverse(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.reverse.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 单锁 操作
- * @param {*} operates
- */
-function handleMenuLock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.lock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 解锁 操作
- * @param {*} operates
- */
-function handleMenuUnlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.unlock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 道岔封锁 操作
- * @param {*} operates
- */
-function handleMenuBlock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.block.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 道岔解封 操作
- * @param {*} operates
- */
-function handleMenuUnblock(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.unblock.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 故障解锁 操作
- * @param {*} operates
- */
-function handleMenuFault(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.fault.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 转动 操作
- * @param {*} operates
- */
-function handleMenuTurnout(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.turnout.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 扳动 操作
- * @param {*} operates
- */
-function handleMenuTurnoutForce(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.turnoutForce.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 计轴预复位 操作
- * @param {*} operates
- */
-function handleMenuAxlePreReset(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.axlePreReset.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 区段切除 操作
- * @param {*} operates
- */
-function handleMenuSplit(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.split.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 区段激活 操作
- * @param {*} operates
- */
-function handleMenuActive(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.active.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置速度 操作
- * @param {*} operates
- */
-function handleMenuSetSpeed(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.setSpeed.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 取消速度 操作
- * @param {*} operates
- */
-function handleMenuCancelSpeed(operates) {
-    if (operates.length == 1) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                operation: SwitchOperation.cancelSpeed.event.query
-            };
-        }
-        return { error: true };
-    } else if (operates.length >= 3) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === SwitchType && operates[0].code) {
-            return {
-                over: true,
-                type: operate.type,
-                code: operates[0].code,
-                operation: SwitchOperation.cancelSpeed.event.confirm
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置计轴有效操作
- * @param {*} operates
- */
-function handleMenuAlxeEffective(operates) {
-    if (operates.length >= 2) {
-        const operate = operates[0];
-        if (operate.type === SwitchType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: SwitchOperation.alxeEffective.event,
-                val: operates[operates.length - 1].val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/TrainOperationConverter.js b/src/scripts/plugin/Converter/TrainOperationConverter.js
deleted file mode 100644
index da4c12f48..000000000
--- a/src/scripts/plugin/Converter/TrainOperationConverter.js
+++ /dev/null
@@ -1,315 +0,0 @@
-import { OperationEvent, getOperateTypeBy, MapDeviceType } from '@/scripts/ConstDic';
-
-const TrainOperation = OperationEvent.Train;
-
-const TrainType = MapDeviceType.Train.type;
-
-export default {
-    test: function (operates) {
-        const operateType = getOperateTypeBy('Train', operates[0].operation);
-        if (operateType) {
-            return true;
-        } else {
-            return false;
-        }
-    },
-    convert: function (operates) {
-        if (operates && operates.length) {
-            const operation = operates[0].operation;
-            switch (operation) {
-            case TrainOperation.cancelStoppage.menu.operation: return handleMenuCancelStopPage(operates);
-
-            case TrainOperation.stoppage.menu.operation: return handleMenuStoppage(operates);
-
-            case TrainOperation.addTrainId.menu.operation: return handleMenuAddTrainId(operates);
-
-            case TrainOperation.editTrainId.menu.operation: return handleMenuEditTrainId(operates);
-
-            case TrainOperation.delTrainId.menu.operation: return handleMenuDelTrainId(operates);
-
-            case TrainOperation.moveTrainId.menu.operation: return handleMenuMoveTrainId(operates);
-
-            case TrainOperation.switchTrainId.menu.operation: return handleMenuSwitchTrainId(operates);
-
-            case TrainOperation.editTrainNo.menu.operation: return handleMenuEditTrainNo(operates);
-
-            case TrainOperation.limitSpeed.menu.operation: return handleMenuLimitSpeed(operates);
-
-            case TrainOperation.setPlanTrainId.menu.operation: return handleMenuSetPlanTrainId(operates);
-
-            case TrainOperation.addPlanTrainId.menu.operation: return handleMenuAddPlanTrainId(operates);
-
-            case TrainOperation.moveEventlyTrainId.menu.operation: return handleMenuMoveEventlyTrainId(operates);
-
-            case TrainOperation.deletePlanTrainId.menu.operation: return handleMenuDeletePlanTrainId(operates);
-
-            }
-        }
-    }
-};
-
-/**
- * 处理右键菜单 取消故障 操作
- * @param {*} operates
- */
-function handleMenuCancelStopPage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.cancelStoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置故障 操作
- * @param {*} operates
- */
-function handleMenuStoppage(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.stoppage.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 添加列车识别号 操作
- * @param {*} operates
- */
-function handleMenuAddTrainId(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.addTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 修改列车识别号 操作
- * @param {*} operates
- */
-function handleMenuEditTrainId(operates) {
-    if (operates.length == 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                operation: TrainOperation.editTrainId.event.query,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    } else if (operates.length > 2) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.editTrainId.event.confirm,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 删除列车识别号 操作
- * @param {*} operates
- */
-function handleMenuDelTrainId(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.delTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 移动列车识别号 操作
- * @param {*} operates
- */
-function handleMenuMoveTrainId(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.moveTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 交换列车识别号 操作
- * @param {*} operates
- */
-function handleMenuSwitchTrainId(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operates[0].code,
-                over: true,
-                operation: TrainOperation.switchTrainId.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 修改车组号 操作
- * @param {*} operates
- */
-function handleMenuEditTrainNo(operates) {
-    if (operates.length >= 1) {
-        const operate = operates[operates.length - 1];
-        if (operate.type === TrainType && operate.val) {
-            return {
-                type: operate.type,
-                code: operate[0].code,
-                over: true,
-                operation: TrainOperation.editTrainNo.event,
-                val: operate.val
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 限速行驶
- * @param {*} operates
- */
-
-function handleMenuLimitSpeed(operates) {
-    if (operates.length > 0) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.limitSpeed.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-/**
- * 处理右键菜单 设置计划车
- * @param {*} operates
- */
-
-function handleMenuSetPlanTrainId(operates) {
-    if (operates.length > 0) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.setPlanTrainId.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-function handleMenuAddPlanTrainId(operates) {
-    if (operates.length > 0) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.addPlanTrainId.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-
-function handleMenuMoveEventlyTrainId(operates) {
-    if (operates.length > 0) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.moveEventlyTrainId.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
-function handleMenuDeletePlanTrainId(operates) {
-    if (operates.length > 0) {
-        const operate = operates[0];
-        if (operate.type === TrainType && operate.code) {
-            return {
-                type: operate.type,
-                code: operate.code,
-                over: true,
-                operation: TrainOperation.deletePlanTrainId.event
-            };
-        }
-        return { error: true };
-    }
-    return null;
-}
diff --git a/src/scripts/plugin/Converter/manager.js b/src/scripts/plugin/Converter/manager.js
deleted file mode 100644
index cadcd2c5d..000000000
--- a/src/scripts/plugin/Converter/manager.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import SwitchOperationConverter from './SwitchOperationConverter';
-import StationControlOperationConverter from './StationControlOperationConverter';
-import StationOperationConverter from './StationOperationConverter';
-import SignalOperationConverter from './SignalRouteOperationConverter';
-import SectionOperationConverter from './SectionOperationConverter';
-import TrainOperationConverter from './TrainOperationConverter';
-import StationStandOperationConverter from './StationStandOperationConverter';
-import CancelLimitOperationConverter from './CancelLimitOperationConverter';
-import MixinOperationConverter from './MixinOperationConverter';
-
-export function getConverter(operates) {
-    if (SwitchOperationConverter.test(operates)) {
-        return SwitchOperationConverter;
-
-    } else if (SignalOperationConverter.test(operates)) {
-        return SignalOperationConverter;
-
-    } else if (StationControlOperationConverter.test(operates)) {
-        return StationControlOperationConverter;
-
-    } else if (StationOperationConverter.test(operates)) {
-        return StationOperationConverter;
-
-    } else if (SectionOperationConverter.test(operates)) {
-        return SectionOperationConverter;
-
-    } else if (StationStandOperationConverter.test(operates)) {
-        return StationStandOperationConverter;
-
-    } else if (TrainOperationConverter.test(operates)) {
-        return TrainOperationConverter;
-
-    } else if (CancelLimitOperationConverter.test(operates)) {
-        return CancelLimitOperationConverter;
-
-    } else if (MixinOperationConverter.test(operates)) {
-        return MixinOperationConverter;
-
-    }
-}
diff --git a/src/scripts/plugin/OperateConvert2Command.js b/src/scripts/plugin/OperateConvert2Command.js
deleted file mode 100644
index 8a2513a60..000000000
--- a/src/scripts/plugin/OperateConvert2Command.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import store from '@/store/index_APP_TARGET';
-import router from '@/router/index_APP_TARGET';
-import OperateHandler from '@/scripts/plugin/OperateHandler';
-import { sendCommand } from '@/api/jmap/training';
-import { OperationEvent } from '@/scripts/ConstDic';
-import { getConverter } from '@/scripts/plugin/Converter/manager';
-
-var OperateConverter = function () { };
-OperateConverter.prototype = {
-
-    /** 转换 操作 为 指令 */
-    convert: function (operate) {
-        if (operate.send) {
-            let command = null;
-            const converter = getConverter(OperateHandler.operates);
-            if (converter) {
-                command = converter.convert(OperateHandler.operates);
-            }
-
-            if (command && command.error) {
-                // 命令错误，可以回退或清空(暂用回退)
-                OperateHandler.operates.pop();
-                command = null;
-            } else if (command && command.over) {
-                // 清空操作组
-                OperateHandler.cleanOperates();
-                store.dispatch('menuOperation/setButtonOperation', null);
-            }
-
-            return command;
-        } else if (operate.operation === OperationEvent.Command.cancel.menu.operation || operate.over) {
-            // 取消操作，清空操作组
-            OperateHandler.cleanOperates();
-        }
-        return null;
-    },
-
-    sendToServer: function (command) {
-        const group = router.currentRoute.query.group;
-        return new Promise((resolve, reject) => {
-            sendCommand(group, command).then((response) => {
-                resolve(response);
-            }).catch(error => {
-                reject(error);
-            });
-        });
-    },
-
-    /** 转换操作 为 指令并发送 */
-    convertAndSend: function (operate) {
-        return new Promise((resolve, reject) => {
-            const command = this.convert(operate);
-            if (command) {
-                this.sendToServer(command).then(response => {
-                    resolve(response);
-                }).catch(error => {
-                    reject(error);
-                });
-            } else {
-                resolve();
-            }
-        });
-    }
-};
-
-export default new OperateConverter();
diff --git a/src/scripts/plugin/OperateHandler.js b/src/scripts/plugin/OperateHandler.js
index 36ca0068d..e69de29bb 100644
--- a/src/scripts/plugin/OperateHandler.js
+++ b/src/scripts/plugin/OperateHandler.js
@@ -1,134 +0,0 @@
-import store from '@/store/index_APP_TARGET';
-import router from '@/router/index_APP_TARGET';
-import OperateConverter from '@/scripts/plugin/OperateConvert2Command';
-import { TrainingMode } from '@/scripts/ConstDic';
-import { getConverter } from '@/scripts/plugin/Converter/manager';
-import { sendTrainingNextStep } from '@/api/jmap/training';
-
-var OperateHandler = function () {
-};
-
-OperateHandler.prototype = {
-    /** 操作组 */
-    operates: [],
-
-    backStep: function(num) {
-        this.operates = this.operates.slice(0, num);
-    },
-
-    /** 清空操作组 */
-    cleanOperates: function () {
-        this.operates.splice(0, this.operates.length);
-    },
-
-    /**
-	 * 判断操作步骤是否正确
-	 */
-    judge: function (operate) {
-        let valid = false;
-        const steps = this.getSteps();
-        const order = this.getOrder();
-        if (order >= steps) {
-            return valid;
-        }
-
-        const standard = steps[order];
-        if (operate && standard && operate.code == standard.code && operate.type == standard.type &&
-			operate.operation == standard.operation &&
-			operate.val == standard.val) {
-            valid = true;
-        }
-        return valid;
-    },
-
-    /**
-	 * 根据模式验证操作步骤
-	 */
-    validate: function (operate) {
-        // 按钮操作之后，第二步错误操作菜单的情况，需要直接返回
-        if ((this.operates.length && operate.start === true) && (this.operates[0].type === 'mbm')) {
-            return false;
-        }
-
-        // 如果是正常的第一步操作，需要清空operates数组
-        if (operate.type === 'mbm' || operate.type === 'bar' || operate.start === true) {
-            this.cleanOperates();
-        }
-
-        this.operates.push(operate);
-
-        // 预处理
-        const converter = getConverter(this.operates);
-        if (converter && converter.preHandle instanceof Function) {
-            operate = converter.preHandle(this.operates);
-        }
-
-        let valid = true;
-        const mode = this.getTrainingMode();
-        if (TrainingMode.TEACH === mode || TrainingMode.PRACTICE === mode) {
-            // 教学模式/练习模式
-            if (this.getTrainingStart()) {
-                valid = this.judge(operate);
-            } else {
-                this.cleanOperates();
-                valid = false;
-            }
-        }
-
-        // 发送每一步的步骤数据;
-        const basicInfo = store.getters['training/basicInfo'];
-        if (basicInfo.id && valid) {
-            const group = router.currentRoute.query.group;
-            console.log('--------------------------');
-            sendTrainingNextStep({ trainingId: basicInfo.id, operate: operate }, group);
-        }
-
-        if (!valid) {
-            // 如果操作校验不正确，回退
-            this.operates.pop();
-        } else {
-            if (operate.cancel === true) {
-                this.cleanOperates();
-            }
-        }
-
-        return valid;
-    },
-    handle: function (operate) {
-        return new Promise((resolve, reject) => {
-            const rtn = { valid: false, response: null };
-            const valid = this.validate(operate);
-
-            rtn.valid = valid;
-
-            if (valid) {
-                // 改变状态开始请求
-                OperateConverter.convertAndSend(operate).then(response => {
-                    rtn.response = response;
-                    resolve(rtn);
-                }).catch(error => {
-                    reject(error);
-                });
-            } else {
-                resolve(rtn);
-            }
-        });
-    },
-    getTrainingMode: function () {
-        return store.state.training.mode;
-    },
-    getSteps: function () {
-        return store.state.training.steps;
-    },
-    getOrder: function () {
-        return store.state.training.order;
-    },
-    getTrainingStart: function () {
-        return store.state.training.started;
-    },
-    getOperateBreakStatus: function () {
-        return store.state.menuOperation.break;
-    }
-};
-
-export default new OperateHandler();
diff --git a/src/scripts/translateSame.js b/src/scripts/translateSame.js
deleted file mode 100644
index 63668298f..000000000
--- a/src/scripts/translateSame.js
+++ /dev/null
@@ -1,45 +0,0 @@
-
-// 转换属性名称
-export const translateSame = {
-	base: {
-		sheetName: '基本信息',
-		columns: [
-			{ key: 'id', tHeader: '地图id', formatter: (val) => { return val || ''; } },
-			{ key: 'name', tHeader: '地图名称', formatter: (val) => { return val || ''; } },
-			{ key: 'authorId', tHeader: '作者id', formatter: (val) => { return val || ''; } },
-			{ key: 'cityCode', tHeader: '城市code', formatter: (val) => { return val || ''; } },
-			{ key: 'skinCode', tHeader: '皮肤类型', formatter: (val) => { return val || ''; } },
-			{ key: 'updateTime', tHeader: '更新时间', formatter: (val) => { return val || ''; } },
-			{ key: 'version', tHeader: '版本类型', formatter: (val) => { return val || ''; } }
-		]
-	},
-	sectionList: {
-		sheetName: '区段',
-		columns: [
-			{ key: 'name', tHeader: '区段名称', formatter: (val) => { return val || ''; } },
-			{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } }
-		]
-	},
-	signalList: {
-		sheetName: '信号机',
-		columns: [
-			{ key: 'name', tHeader: '信号机名称', formatter: (val) => { return val || ''; } },
-			{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } }
-		]
-	},
-	stationStandList: {
-		sheetName: '站台',
-		columns: [
-			{ key: 'name', tHeader: '站台名称', formatter: (val) => { return val || ''; } },
-			{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } },
-			{ key: 'direction', tHeader: '行驶方向', formatter: (val) => { return val || ''; } }
-		]
-	},
-	switchList: {
-		sheetName: '道岔',
-		columns: [
-			{ key: 'name', tHeader: '道岔名称', formatter: (val) => { return val || ''; } },
-			{ key: 'code', tHeader: '编号', formatter: (val) => { return val || ''; } }
-		]
-	}
-};
diff --git a/src/store/modules/exam.js b/src/store/modules/exam.js
index 7663d4895..aa709a6fc 100644
--- a/src/store/modules/exam.js
+++ b/src/store/modules/exam.js
@@ -2,7 +2,6 @@ import store from '@/store/index_APP_TARGET';
 
 const exam = {
     namespaced: true,
-
     state: {
         deviceCode: '', // 考试目标code
         started: false, 	// 考试状态
diff --git a/src/store/modules/training.js b/src/store/modules/training.js
index c419e4ad5..dd6f91e8a 100644
--- a/src/store/modules/training.js
+++ b/src/store/modules/training.js
@@ -1,6 +1,5 @@
 import Vue from 'vue';
 import { TrainingMode } from '@/scripts/ConstDic';
-import OperateHandler from '@/scripts/plugin/OperateHandler';
 import deviceType from '../../jmapNew/constant/deviceType';
 import LangStorage from '@/utils/lang';
 import Handler from '@/scripts/cmdPlugin/Handler';
@@ -322,7 +321,6 @@ const training = {
          */
         reset: ({ commit }) => {
             commit('over');
-            // commit('stopCountTime');
 
             // 清空计时器以及得分
             commit('resetUsedTime');
@@ -337,10 +335,8 @@ const training = {
          */
         start: ({ commit }) => {
             // 清空操作组
-            OperateHandler.cleanOperates();
             Handler.clear(); // 两种方式
             // 清空计时器以及得分
-            // commit('stopCountTime');
             commit('resetUsedTime');
             commit('resetScore');
             commit('start');
@@ -359,7 +355,6 @@ const training = {
          */
         over: ({ commit }) => {
             commit('over');
-            // commit('stopCountTime');
         },
 
         /**
@@ -401,22 +396,17 @@ const training = {
             }
         },
 
-        /**
-		 * 开始实训（模式变更和开始的混合操作）
-		 */
+        // 开始实训（模式变更和开始的混合操作）
         startTraining: ({ commit }, opts) => {
             commit('resetOrder');
             commit('changeMode', opts.mode);
             if (opts.start) {
                 // 清空计时器以及得分
-                // commit('stopCountTime');
                 commit('resetUsedTime');
                 commit('resetScore');
                 // 开始实训
                 commit('start');
                 commit('next');
-                // // 开始计时
-                // commit('countUsedTime');
             }
         },
         // 计时（教学正计时与仿真当前时间）
@@ -424,31 +414,27 @@ const training = {
             commit('countTime', type);
         },
 
-        /**
-		 * 开始实训（模式变更和开始的混合操作）
-		 */
+        // 开始实训（模式变更和开始的混合操作）
         backSteps: ({ commit }, stepNum) => {
             if (Number.isInteger) {
                 commit('backOrder', stepNum);
             }
         },
 
-        /**
-		 * 下一步
-		 */
-        next: ({ commit, state }, operate) => {
-            commit('setOperate', operate);
+        // 下一步
+        nextNew: ({ commit, state }, operate) => {
             return new Promise((resolve, reject) => {
+                commit('setOperate', operate);
                 if (!state.started && !state.mode) {
                     commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
                     return;
                 }
 
                 // 处理operation
-                OperateHandler.handle(operate).then(rtn => {
-                    if (state.started) {
+                Handler.handle(operate).then(rtn => {
+                    if (state.trainingStart) {
                         // 教学和联系模式需要给出过程步骤提示
-                        if (TrainingMode.TEACH === state.mode || TrainingMode.PRACTICE === state.mode) {
+                        if (TrainingMode.TEACH == state.mode || TrainingMode.PRACTICE == state.mode) {
                             if (rtn && rtn.valid) {
                                 commit('next');
                                 commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green' });
@@ -458,61 +444,19 @@ const training = {
                                     commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'operation mistake!' : '操作错误！', color: 'red' });
                                 }
                             }
-                        } else if (TrainingMode.EXAM === state.mode || TrainingMode.TEST === state.mode) {
+                        } else if (TrainingMode.EXAM == state.mode || TrainingMode.TEST == state.mode) {
                             // 测试和考试不给提示
                             rtn && rtn.valid && commit('next');
                         }
                     }
                     resolve(rtn);
                 }).catch(error => {
+                    // console.error(error);
                     reject(error);
                 });
             });
         },
 
-        /**
-		 * 下一步
-		 */
-        nextNew: ({ commit, state }, operate) => {
-            return new Promise((resolve, reject) => {
-                commit('setOperate', operate);
-                if (!state.started && !state.mode) {
-                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'Please click start, start training!' : '请点击开始，开始实训！', color: 'red' });
-                    return;
-                }
-
-                try {
-                    // 处理operation
-                    Handler.handle(operate).then(rtn => {
-                        if (state.trainingStart) {
-                            // 教学和联系模式需要给出过程步骤提示
-                            if (TrainingMode.TEACH === state.mode || TrainingMode.PRACTICE === state.mode) {
-                                if (rtn && rtn.valid) {
-                                    commit('next');
-                                    commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? "Correct operation! That's great!" : '操作正确！真棒！', color: 'green' });
-                                    commit('tipEventIncrement');
-                                } else {
-                                    if (!operate.repeat) {
-                                        commit('setOperateErrMsg', { errMsg: LangStorage.getLang() == 'en' ? 'operation mistake!' : '操作错误！', color: 'red' });
-                                    }
-                                }
-                            } else if (TrainingMode.EXAM === state.mode || TrainingMode.TEST === state.mode) {
-                            // 测试和考试不给提示
-                                rtn && rtn.valid && commit('next');
-                            }
-                        }
-                        resolve(rtn);
-                    }).catch(error => {
-                        console.error(error);
-                        reject(error);
-                    });
-                } catch (error) {
-                    console.error(error);
-                    reject(error);
-                }
-            });
-        },
-
         /**
 		 * 提示消息重新加载
 		 */
@@ -622,7 +566,6 @@ const training = {
         end: ({ commit }, mode) => {
             commit('over');
             commit('resetOrder');
-            // commit('stopCountTime');
             commit('changeMode', mode);
         },
 
diff --git a/src/utils/Export2Excel.js b/src/utils/Export2Excel.js
index 68d69b5f9..f75d83afc 100644
--- a/src/utils/Export2Excel.js
+++ b/src/utils/Export2Excel.js
@@ -2,50 +2,49 @@
 require('script-loader!file-saver');
 require('@/utils/Blob');
 import XLSX from 'xlsx';
-import { translate } from '@/scripts/translate';
-import { translateSame } from '@/scripts/translateSame';
+// import { translate } from '@/scripts/translate';
 
 
-function generateArray(table) {
-    var out = [];
-    var rows = table.querySelectorAll('tr');
-    var ranges = [];
-    for (var R = 0; R < rows.length; ++R) {
-        var outRow = [];
-        var row = rows[R];
-        var columns = row.querySelectorAll('td');
-        for (var C = 0; C < columns.length; ++C) {
-            var cell = columns[C];
-            var colspan = cell.getAttribute('colspan');
-            var rowspan = cell.getAttribute('rowspan');
-            var cellValue = cell.innerText;
-            if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+// function generateArray(table) {
+//     var out = [];
+//     var rows = table.querySelectorAll('tr');
+//     var ranges = [];
+//     for (var R = 0; R < rows.length; ++R) {
+//         var outRow = [];
+//         var row = rows[R];
+//         var columns = row.querySelectorAll('td');
+//         for (var C = 0; C < columns.length; ++C) {
+//             var cell = columns[C];
+//             var colspan = cell.getAttribute('colspan');
+//             var rowspan = cell.getAttribute('rowspan');
+//             var cellValue = cell.innerText;
+//             if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
 
-            //Skip ranges
-            ranges.forEach(function (range) {
-                if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
-                    for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
-                }
-            });
+//             //Skip ranges
+//             ranges.forEach(function (range) {
+//                 if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+//                     for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+//                 }
+//             });
 
-            //Handle Row Span
-            if (rowspan || colspan) {
-                rowspan = rowspan || 1;
-                colspan = colspan || 1;
-                ranges.push({ s: { r: R, c: outRow.length }, e: { r: R + rowspan - 1, c: outRow.length + colspan - 1 } });
-            }
-            ;
+//             //Handle Row Span
+//             if (rowspan || colspan) {
+//                 rowspan = rowspan || 1;
+//                 colspan = colspan || 1;
+//                 ranges.push({ s: { r: R, c: outRow.length }, e: { r: R + rowspan - 1, c: outRow.length + colspan - 1 } });
+//             }
+//             ;
 
-            //Handle Value
-            outRow.push(cellValue !== "" ? cellValue : null);
+//             //Handle Value
+//             outRow.push(cellValue !== "" ? cellValue : null);
 
-            //Handle Colspan
-            if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
-        }
-        out.push(outRow);
-    }
-    return [out, ranges];
-};
+//             //Handle Colspan
+//             if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+//         }
+//         out.push(outRow);
+//     }
+//     return [out, ranges];
+// };
 
 function datenum(v, date1904) {
     if (date1904) v += 1462;
@@ -228,45 +227,36 @@ function s2ab(s) {
     return buf;
 }
 
-export function export_table_to_excel(id) {
-    var theTable = document.getElementById(id);
-    var oo = generateArray(theTable);
-    var ranges = oo[1];
+// export function export_table_to_excel(id) {
+//     var theTable = document.getElementById(id);
+//     var oo = generateArray(theTable);
+//     var ranges = oo[1];
 
-    /* original data */
-    var data = oo[0];
-    var ws_name = "SheetJS";
+//     var data = oo[0];
+//     var ws_name = "SheetJS";
 
-    var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
+//     var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
 
-    /* add ranges to worksheet */
-    // ws['!cols'] = ['apple', 'banan'];
-    ws['!merges'] = ranges;
+//     ws['!merges'] = ranges;
 
-    /* add worksheet to workbook */
-    wb.SheetNames.push(ws_name);
-    wb.Sheets[ws_name] = ws;
+//     wb.SheetNames.push(ws_name);
+//     wb.Sheets[ws_name] = ws;
 
-    var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
+//     var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
 
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), "test.xlsx")
-}
+//     saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), "test.xlsx")
+// }
 
-function formatJson(filterVal, jsonData) {
-    return jsonData.map(v => filterVal.map(j => v[j]))
-}
+// function formatJson(filterVal, jsonData) {
+//     return jsonData.map(v => filterVal.map(j => v[j]))
+// }
 export function export_json_to_excel(th, jsonData, defaultTitle) {
-
-    /* original data */
-
     var data = jsonData;
     data.unshift(th);
     var ws_name = "SheetJS";
 
     var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
 
-
-    /* add worksheet to workbook */
     wb.SheetNames.push(ws_name);
     wb.Sheets[ws_name] = ws;
 
@@ -275,65 +265,43 @@ export function export_json_to_excel(th, jsonData, defaultTitle) {
     saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
 }
 
-// 转换数据格式
-function handelData(translate, key) {
-    let tHeader = [];
-    let tHeaderF = [];
-    if (translate[key]) {
-        translate[key].columns.forEach(item => {
-            tHeader.push(item.tHeader);
-            tHeaderF.push(item.key);
-        });
-    }
-    let filterVal = {
-        tHeader: tHeader,
-        tHeaderF: tHeaderF,
-    };
-    return filterVal;
-}
+// // 转换数据格式
+// function handelData(translate, key) {
+//     let tHeader = [];
+//     let tHeaderF = [];
+//     if (translate[key]) {
+//         translate[key].columns.forEach(item => {
+//             tHeader.push(item.tHeader);
+//             tHeaderF.push(item.key);
+//         });
+//     }
+//     let filterVal = {
+//         tHeader: tHeader,
+//         tHeaderF: tHeaderF,
+//     };
+//     return filterVal;
+// }
 
-export function export_json_excel(jsonData, defaultTitle) {
-    let data = jsonData;
-    let wb = new Workbook();
+// export function export_json_excel(jsonData, defaultTitle) {
+//     let data = jsonData;
+//     let wb = new Workbook();
 
-    for (let index in data) {
-        let filterVal = handelData(translate, index);
-        if (filterVal.tHeader.length) {
-            let dataDetail = formatJson(filterVal.tHeaderF, data[index]);
-            dataDetail.unshift(filterVal.tHeader);  // 设置表头的
-            let ws = sheet_from_array_of_arrays(dataDetail);
-            /* add worksheet to workbook */
+//     for (let index in data) {
+//         let filterVal = handelData(translate, index);
+//         if (filterVal.tHeader.length) {
+//             let dataDetail = formatJson(filterVal.tHeaderF, data[index]);
+//             dataDetail.unshift(filterVal.tHeader);  // 设置表头的
+//             let ws = sheet_from_array_of_arrays(dataDetail);
+//             /* add worksheet to workbook */
 
-            let title = translate[index].sheetName || index;
-            wb.SheetNames.push(title);
-            wb.Sheets[`${title}`] = ws;
-        }
-    }
-    let wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
+//             let title = translate[index].sheetName || index;
+//             wb.SheetNames.push(title);
+//             wb.Sheets[`${title}`] = ws;
+//         }
+//     }
+//     let wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
 
-    var title = defaultTitle || '列表'
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
-}
+//     var title = defaultTitle || '列表'
+//     saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
+// }
 
-export function export_json_excel_same(jsonData, defaultTitle) {
-    let data = jsonData;
-    let wb = new Workbook();
-
-    for (let index in data) {
-        let filterVal = handelData(translateSame, index);
-        if (filterVal.tHeader.length) {
-            let dataDetail = formatJson(filterVal.tHeaderF, data[index]);
-            dataDetail.unshift(filterVal.tHeader);  // 设置表头的
-            let ws = sheet_from_array_of_arrays(dataDetail);
-            /* add worksheet to workbook */
-
-            let title = translate[index].sheetName || index;
-            wb.SheetNames.push(title);
-            wb.Sheets[`${title}`] = ws;
-        }
-    }
-    let wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
-
-    var title = defaultTitle || '列表'
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
-}
\ No newline at end of file
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index 4bb14fdb5..c0569ef83 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -4,8 +4,8 @@ export function getBaseUrl() {
         // BASE_API = 'https://joylink.club/jlcloud';
         BASE_API = 'https://test.joylink.club/jlcloud';
         // BASE_API = 'http://192.168.8.107:9000'; // 袁琪
-        // BASE_API = 'http://192.168.8.114:9000'; // 旭强
-        // BASE_API = 'http://192.168.8.109:9000'; // 张赛
+        // BASE_API = 'http://192.168.8.129:9000'; // 旭强
+        // BASE_API = 'http://192.168.8.119:9000'; // 张赛
         // BASE_API = 'http://192.168.8.110:9000'; // 杜康
         // BASE_API = 'http://b29z135112.zicp.vip';
         // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
diff --git a/src/utils/runPlan.js b/src/utils/runPlan.js
index 5fea77427..8fdb324e4 100644
--- a/src/utils/runPlan.js
+++ b/src/utils/runPlan.js
@@ -60,7 +60,7 @@ export function createSeriesModel(opt, lineStyle) {
 }
 
 /** 创建标记横线*/
-export function createMarkLineModels(stations, computedYaxis) {
+export function createMarkLineModels(stations, computedYaxis, opt = {}) {
     const markLineModel = {};
     if (stations && stations.length) {
         markLineModel.type = 'line';
@@ -71,6 +71,7 @@ export function createMarkLineModels(stations, computedYaxis) {
         markLineModel.markLine.lineStyle = { color: '#B0C4DE', width: 0.5 };
         markLineModel.markLine.symbol = 'none';
         markLineModel.elements = [];
+        Object.assign(markLineModel, opt);
         stations.forEach((elem, index) => {
             markLineModel.markLine.data.push(
                 {
diff --git a/src/views/competitionManage/setExamTime.vue b/src/views/competitionManage/setExamTime.vue
deleted file mode 100644
index 057f4039e..000000000
--- a/src/views/competitionManage/setExamTime.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="试卷导出" width="500px">
-    <el-form ref="form" :model="form" label-width="150px" :rules="rules">
-      <el-form-item label="理论竞赛时长:" prop="theoryExamTime">
-        <el-input-number v-model="form.theoryExamTime" controls-position :min="1" /><span>&nbsp;&nbsp;分</span>
-      </el-form-item>
-      <el-form-item label="实操竞赛时长:" prop="operateExamTime">
-        <el-input-number v-model="form.operateExamTime" controls-position :min="1" /><span>&nbsp;&nbsp;分</span>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="handleExport">导出</el-button>
-        <el-button @click="handleClose">取消</el-button>
-      </el-form-item>
-    </el-form>
-  </el-dialog>
-
-</template>
-
-<script>
-import { getRaceById } from '@/api/competition';
-export default {
-    mixins: [
-        // WindowResizeHandler
-    ],
-    props: {
-        operateQuestionList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        },
-        theoryQuestionList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            index: 0,
-            height: 0,
-            loading: false,
-            dialogVisible: false,
-            form: {
-                theoryExamTime: 1,
-                operateExamTime: 1
-            },
-            rules: {
-                theoryExamTime: [
-                    { required: true, message: '请输入理论竞赛时长', trigger: 'blur' }
-                ],
-                operateExamTime: [
-                    { required: true, message: '请输入实操竞赛时长', trigger: 'blur' }
-                ]
-            }
-        };
-    },
-    computed: {
-    },
-    watch: {
-
-    },
-    methods: {
-        doShow() {
-            this.dialogVisible = true;
-        },
-        handleClose() {
-            this.dialogVisible = false;
-        },
-        handleExport() {
-            getRaceById(this.$route.query.raceId).then(resp => {
-                const exportData = {
-                    practicalQuestions: this.operateQuestionList,
-                    theoryQuestions: this.theoryQuestionList,
-                    competitionId: this.$route.query.raceId,
-                    theoryExamTime: this.form.theoryExamTime,
-                    practicalExamTime: this.form.operateExamTime
-                };
-                const content = new Blob([JSON.stringify(exportData)]);
-                const urlObject = window.URL || window.webkitURL || window;
-                const url = urlObject.createObjectURL(content);
-                const el = document.createElement('a');
-                el.href = url;
-                el.download = `${resp.data.name}试卷.json`;
-                el.click();
-                urlObject.revokeObjectURL(url);
-                this.dialogVisible = false;
-            }).catch(()=> {
-                this.$message.error('查询竞赛详情失败！');
-            });
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.layer-center {
-		width: 900px;
-		height: 100%;
-		margin: auto;
-		background: #fff;
-	}
-
-	.quiz {
-		background: #eee;
-		height: 100%;
-
-		&::-webkit-scrollbar {
-			display:none
-		}
-
-		&__card {
-			height: 100%;
-			.dir-item {
-				padding-left: 25px;
-			}
-
-			.dir-caption {
-				padding-left: 10px;
-				line-height: 26px;
-				background: #f1f1f1;
-			}
-
-		}
-
-		&__container {
-			height: 100%;
-
-			&-header {
-				height: auto !important;
-
-				.title {
-					font-size: 24px;
-					line-height: 60px;
-					font-weight: bold;
-					text-align: center;
-				}
-
-				.notes {
-					color:#606266;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					margin:  0 20px;
-				}
-			}
-
-			&-main {
-				.section {
-					padding: 5px 20px;
-					.caption {
-						line-height: 26px;
-					}
-					.context {
-					}
-				}
-			}
-
-			&-footer {
-				text-align: right;
-				position: sticky;
-				bottom: 0px;
-				padding: 40px ;
-				.buttons {
-					position: relative;
-					bottom: 20px;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/views/competitionManage/theoryQuestion.vue b/src/views/competitionManage/theoryQuestion.vue
deleted file mode 100644
index 4085c872e..000000000
--- a/src/views/competitionManage/theoryQuestion.vue
+++ /dev/null
@@ -1,244 +0,0 @@
-<template>
-  <el-dialog :visible.sync="dialogVisible" :before-close="handleClose" title="理论试题" width="80%">
-    <query-list-page ref="user" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-  </el-dialog>
-
-</template>
-
-<script>
-import { listQuestionPage } from '@/api/questionBank.js';
-export default {
-    mixins: [
-        // WindowResizeHandler
-    ],
-    props: {
-        theoryIndexList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            index: 0,
-            height: 0,
-            loading: false,
-            dialogVisible: false,
-            pagerConfig: {
-                pageSize: 'pageSize',
-                pageIndex: 'pageNum'
-            },
-            queryForm: {
-                reset: true,
-                labelWidth: '80px',
-                queryObject: {
-                    type: {
-                        type: 'select',
-                        label: '类 型',
-                        config: {
-                            data: this.$ConstSelect.QuestionTypeList
-                        }
-                    },
-                    topic: {
-                        type: 'text',
-                        label: '题 目'
-                    }
-                }
-            },
-            queryList: {
-                query: listQuestionPage,
-                selectCheckShow: false,
-                indexShow: true,
-                afterQuery: this.afterQuery,
-                columns: [
-                    {
-                        title: '类 型',
-                        prop: 'type',
-                        type: 'tag',
-                        width: '120',
-                        columnValue: (row) => { return this.$ConstSelect.translate(row.type, 'QuestionTypeList'); },
-                        tagType: (row) => {
-                            return '';
-                        }
-                    },
-                    {
-                        title: '题 目',
-                        prop: 'topic',
-                        type: 'html'
-                    },
-                    {
-                        title: '答 案',
-                        prop: 'answer',
-                        type: 'tagMore',
-                        width: '100',
-                        columnValue: (row) => { return this.answerTags(row); },
-                        tagType: (row) => {
-                            return '';
-                        }
-                    },
-                    {
-                        title: '创建人',
-                        prop: 'createUserName',
-                        width: '100'
-                    },
-                    {
-                        type: 'button',
-                        title: '操 作',
-                        width: '100',
-                        buttons: [
-                            {
-                                name: '添加',
-                                handleClick: this.addQuestion,
-                                showControl: (row) => { return !row.paper; },
-                                type: 'success'
-                            },
-                            {
-                                name: '移出',
-                                handleClick: this.removeQuestion,
-                                showControl: (row) => { return row.paper; },
-                                type: 'warning'
-                            }
-                        ]
-                    }
-                ]
-            }
-        };
-    },
-    computed: {
-    },
-    watch: {
-
-    },
-    methods: {
-        loadInitData() {
-            this.$nextTick(() => {
-                this.queryList.reload();
-            });
-        },
-        doShow() {
-            this.dialogVisible = true;
-            this.loadInitData();
-        },
-        handleClose() {
-            this.dialogVisible = false;
-        },
-        addQuestion(index, row) {
-            this.$set(row, 'paper', true);
-            row.score = 0;
-            this.$emit('addQuestion', row);
-        },
-        afterQuery(data) {
-            if (data && data.list) {
-                const that = this;
-                const list = data.list;
-                if (list) {
-                    list.map(elem => {
-                        this.$set(elem, 'paper', that.theoryIndexList.includes(elem.id));
-                    });
-                }
-            }
-            return data;
-        },
-        removeQuestion(index, row) {
-            this.$set(row, 'paper', false);
-            this.$emit('removeQuestion', row);
-        },
-        answerTags(row) {
-            const answer = [];
-            row.optionList.forEach((el, i) => {
-                switch (row.type) {
-                case 'select':
-                    if (el.correct) {
-                        answer.push(this.$asc2chart(i + 65));
-                    }
-                    break;
-                case 'judge':
-                    if (el.correct) {
-                        answer.push(el.content);
-                    }
-                    break;
-                }
-            });
-            return answer;
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.layer-center {
-		width: 900px;
-		height: 100%;
-		margin: auto;
-		background: #fff;
-	}
-
-	.quiz {
-		background: #eee;
-		height: 100%;
-
-		&::-webkit-scrollbar {
-			display:none
-		}
-
-		&__card {
-			height: 100%;
-			.dir-item {
-				padding-left: 25px;
-			}
-
-			.dir-caption {
-				padding-left: 10px;
-				line-height: 26px;
-				background: #f1f1f1;
-			}
-
-		}
-
-		&__container {
-			height: 100%;
-
-			&-header {
-				height: auto !important;
-
-				.title {
-					font-size: 24px;
-					line-height: 60px;
-					font-weight: bold;
-					text-align: center;
-				}
-
-				.notes {
-					color:#606266;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					margin:  0 20px;
-				}
-			}
-
-			&-main {
-				.section {
-					padding: 5px 20px;
-					.caption {
-						line-height: 26px;
-					}
-					.context {
-					}
-				}
-			}
-
-			&-footer {
-				text-align: right;
-				position: sticky;
-				bottom: 0px;
-				padding: 40px ;
-				.buttons {
-					position: relative;
-					bottom: 20px;
-				}
-			}
-		}
-	}
-</style>
diff --git a/src/views/competitionManage/theoryReview.vue b/src/views/competitionManage/theoryReview.vue
deleted file mode 100644
index f10a9ac53..000000000
--- a/src/views/competitionManage/theoryReview.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <el-dialog fullscreen :visible.sync="dialogVisible" :before-close="handleClose" style="height: 100%;" title="理论试题预览" :show-close="showClose" center>
-    <el-container class="quiz">
-      <el-container class="quiz__container">
-        <el-header class="quiz__container-header layer-center">
-          <div class="title">{{ formModel.name }}</div>
-          <div class="notes">{{ formModel.description }}</div>
-        </el-header>
-        <el-main class="quiz__container-main layer-center">
-          <div v-for="(el,i) in sortedList" :id="'anchor__lst-'+i" :key="i" class="section">
-            <template v-if="el.children.length">
-              <div class="caption">{{ index2UnicodeList[i] }}、{{ el.title }} </div>
-              <question v-for="(item,j) in el.children" :id="'anchor__lst-'+item.type+'-'+item.index" :key="j" v-model="item.answer" class="context" :option="item" @save="onSave" />
-            </template>
-          </div>
-        </el-main>
-        <el-footer class="quiz__container-footer layer-center" @click="returnTop">
-          <el-button-group class="buttons">
-            <el-button v-loading="loading" type="primary" @click="handleClose">返回</el-button>
-          </el-button-group>
-        </el-footer>
-      </el-container>
-    </el-container>
-  </el-dialog>
-
-</template>
-
-<script>
-import Question from '@/views/jsxt/competition/theory/quiz/question';
-export default {
-    components: {
-        Question
-    },
-    mixins: [
-        // WindowResizeHandler
-    ],
-    props: {
-        theoryQuestionList: {
-            type: Array,
-            default() {
-                return [];
-            }
-        }
-    },
-    data() {
-        return {
-            index: 0,
-            height: 0,
-            loading: false,
-            showClose: false,
-            dialogVisible: false,
-            formModel: {
-                description: '',
-                duration: 10,
-                name: '',
-                status: '',
-                totalScore: 0,
-                passScore: 10
-            }
-        };
-    },
-    computed: {
-        examId() {
-            return this.$route.params.examId;
-        },
-        userExamId() {
-            return this.$route.params.userExamId;
-        },
-        question() {
-            return this.theoryQuestionList[this.index] || {};
-        },
-        index2UnicodeList() {
-            return ['一', '二', '三', '四'];
-        },
-        sortedList() {
-            return [
-                {
-                    title: '判断题',
-                    children: this.theoryQuestionList.filter(el => { return el.type === 'judge'; })
-                },
-                {
-                    title: '选择题',
-                    children: this.theoryQuestionList.filter(el => { return el.type === 'select'; })
-                }
-            ];
-        }
-    },
-    watch: {
-        '$router': function() {
-            this.loadInitData();
-        }
-    },
-    methods: {
-        loadInitData() {
-            console.log('获取试题详情');
-        },
-        doShow() {
-            this.dialogVisible = true;
-            this.loadInitData();
-        },
-        resizeHandler() {
-            this.height = this._clientHeight;
-        },
-        appendIndex(str, index) {
-            return `${index + 1}. ${str}`;
-        },
-        goAnchor(selector) {
-            const anchor = this.$el.querySelector(selector);
-            const el = this.$el.querySelector('.el-main');
-            if (anchor && el) {
-                el.scrollTop = anchor.offsetTop;
-            }
-        },
-        returnTop() {
-            document.querySelector('.el-header').scrollIntoView(true);
-        },
-        onSave(data) {
-            console.log(data, '问答题');
-        },
-        handleClose() {
-            this.dialogVisible = false;
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.layer-center {
-		width: 900px;
-		height: 100%;
-		margin: auto;
-		background: #fff;
-	}
-
-	.quiz {
-		background: #eee;
-		height: 100%;
-
-		&::-webkit-scrollbar {
-			display:none
-		}
-
-		&__card {
-			height: 100%;
-			.dir-item {
-				padding-left: 25px;
-			}
-
-			.dir-caption {
-				padding-left: 10px;
-				line-height: 26px;
-				background: #f1f1f1;
-			}
-
-		}
-
-		&__container {
-			height: 100%;
-
-			&-header {
-				height: auto !important;
-
-				.title {
-					font-size: 24px;
-					line-height: 60px;
-					font-weight: bold;
-					text-align: center;
-				}
-
-				.notes {
-					color:#606266;
-					white-space: nowrap;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					margin:  0 20px;
-				}
-			}
-
-			&-main {
-				.section {
-					padding: 5px 20px;
-					.caption {
-						line-height: 26px;
-					}
-					.context {
-					}
-				}
-			}
-
-			&-footer {
-				text-align: right;
-				position: sticky;
-				bottom: 0px;
-				padding: 40px ;
-				.buttons {
-					position: relative;
-					bottom: 20px;
-				}
-			}
-		}
-	}
-	/deep/
-	.el-dialog__body {
-		height: calc(100% - 24px);
-		padding: 0;
-	}
-	/deep/
-	.el-dialog__header {
-		padding: 0;
-		background: #409EFF;
-		height: 24px;
-	}
-</style>
diff --git a/src/views/components/limits/distribute.vue b/src/views/components/limits/distribute.vue
index a12c06355..c011c11bf 100644
--- a/src/views/components/limits/distribute.vue
+++ b/src/views/components/limits/distribute.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="600px" :before-close="handleClose" center>
     <div>
-      <el-alert :title="$t('permission.distributeTips')" type="warning" show-icon :closable="closable" style="margin-bottom:10px" />
+      <el-alert :title="$t('permission.distributeTips')" type="warning" show-icon :closable="closable" style="margin-bottom:10px;" />
       <el-form ref="distributeForm" :rules="rules" :model="formModel">
         <el-form-item key="date" prop="date" :label="this.$t('global.selectionTime')" :required="false" label-width="140px">
           <el-date-picker
@@ -53,9 +53,8 @@
             align="center"
           >
             <template slot-scope="scope">
-              <!-- :label="$t('global.permissionList')"  -->
               <el-form-item :prop="'permissionList.' + scope.$index + '.chooseNumber'" :required="false" :rules="rules.chooseNumber">
-                <el-input-number v-model="scope.row.chooseNumber" size="mini" :max="scope.row.remains" :min="0" />
+                <el-input-number v-model="scope.row.chooseNumber" size="mini" :max="scope.row.remains - 1" :min="0" />
               </el-form-item>
             </template>
           </el-table-column>
diff --git a/src/views/components/limits/index.vue b/src/views/components/limits/index.vue
index 5bed08521..4c2662b3a 100644
--- a/src/views/components/limits/index.vue
+++ b/src/views/components/limits/index.vue
@@ -5,7 +5,7 @@
       border
       :summary-method="getSummaries"
       show-summary
-      style="width: 100%; margin-top: 20px"
+      style="width: 100%; margin-top: 20px;"
     >
       <el-table-column prop="index" :label="`${$t('global.index')}`" />
       <el-table-column prop="startTime" :label="`${$t('permission.startTime')}`" />
@@ -86,7 +86,6 @@ export default {
                                     notAllow = notAllow + Number(item.remains);
                                 }
                             });
-
                             sums[index] = this.$t('global.hasPermissionTip').replace('{0}', allow).replace('{1}', notAllow);
                         }
                     }
diff --git a/src/views/designPlatform/testRunplan.vue b/src/views/designPlatform/testRunplan.vue
new file mode 100644
index 000000000..17e005d67
--- /dev/null
+++ b/src/views/designPlatform/testRunplan.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="map-view" :style="{width: canvasWidth+'px',height:'100%',position:'absolute',overflow:'hidden'}">
+    <div v-show="maskOpen" class="mask" :style="{'width': maskWidth}" />
+    <jlmap-visual ref="jlmapVisual" />
+    <div class="display-draft">
+      <el-button-group>
+        <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
+        <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
+        <el-button type="small" @click="back">{{ $t('scriptRecord.scriptBack') }}</el-button>
+      </el-button-group>
+    </div>
+    <set-time ref="setTime" @ConfirmSelectBeginTime="start" />
+    <menu-system-time ref="menuSystemTime" :offset="15" :group="group" />
+  </div>
+</template>
+<script>
+import SetTime from '@/views/newMap/displayNew/demon/setTime';
+import JlmapVisual from '@/views/newMap/jlmapNew/index';
+import { Notification } from 'element-ui';
+import { loadNewMapDataByGroup } from '@/utils/loaddata';
+import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation';
+import { creatSubscribe, clearSubscribe, displayTopic} from '@/utils/stomp';
+import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
+import { getToken } from '@/utils/auth';
+import { mapGetters } from 'vuex';
+import { timeFormat } from '@/utils/date';
+export default {
+    name:'TestRunplan',
+    components: {
+        SetTime,
+        JlmapVisual,
+        MenuSystemTime
+    },
+    data() {
+        return {
+            maskOpen: false,
+            maskWidth: '100%'
+        };
+    },
+    computed:{
+        ...mapGetters([
+            'canvasWidth'
+        ]),
+        group() {
+            return this.$route.query.group;
+        },
+        isDisable() {
+            return this.$store.state.training.started;
+        },
+        width() {
+            return this.$store.state.app.width;
+        },
+        height() {
+            return this.$store.state.app.height;
+        }
+    },
+    watch:{
+        '$store.state.map.mapViewLoadedCount':function() {
+            this.$store.dispatch('map/setTrainWindowShow', false);
+            // this.$jlmap.off('zoom');
+            if (this.group) {
+                this.subscribe();
+            }
+        },
+        '$store.state.app.windowSizeCount': function() { // 窗口缩放
+            this.setWindowSize();
+        },
+        '$store.state.socket.equipmentStatus': function (val) {
+            if (val.length && this.$route.query.group) {
+                this.statusMessage(val);
+            }
+        },
+        '$store.state.socket.simulationStart': function(val) {
+            this.$store.dispatch('training/simulationStart').then(() => {
+                this.$store.dispatch('map/setShowCentralizedStationNum');
+            });
+        }
+    },
+    async beforeDestroy() {
+        await this.$store.dispatch('map/mapClear');
+    },
+    async mounted() {
+        this.setWindowSize();
+        await this.initLoadData();
+    },
+    methods:{
+        async initLoadData() { // 加载地图数据
+            if (this.group) {
+                this.loadSimulationInfo();
+                await loadNewMapDataByGroup(this.group);
+            }
+        },
+        // 缩放设置
+        setWindowSize() {
+            const width = this.width;
+            const height = this.height;
+            this.$store.dispatch('config/resize', { width, height });
+        },
+        async back() {
+            if (this.group) {
+                await clearSimulation(this.group);
+                this.clearSubscribe();
+            }
+            this.$store.dispatch('map/setShowCentralizedStationCode', '');
+            history.go(-1);
+            Notification.closeAll();
+        },
+        selectBeginTime() {
+            this.$refs.setTime.doShow();
+        },
+        async statusMessage(list) {
+            await this.$store.dispatch('training/updateMapState', list);
+            await this.$store.dispatch('socket/setEquipmentStatus');
+        },
+        end() {
+            exitRunPlan(this.group).then(() => {
+                this.$store.dispatch('training/over').then(() => {
+                    this.$store.dispatch('training/setMapDefaultState').then(() => {
+                        this.$store.dispatch('map/resetActiveTrainList', false);
+                        this.$store.dispatch('map/clearJlmapTrainView');
+                        this.$store.dispatch('map/setTrainWindowShow', false);
+                    });
+                });
+            }).catch(() => {
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
+        },
+        async subscribe() {
+            this.clearSubscribe();
+            const header = { group: this.group || '', 'X-Token': getToken() };
+            creatSubscribe(`${displayTopic}\/${this.$route.query.group}`, header);
+
+            await this.$store.dispatch('training/setHasSubscribed');
+        },
+        clearSubscribe() {
+            clearSubscribe(`${displayTopic}\/${this.group}`);
+        },
+        async loadSimulationInfo() {
+            const resp = await getSimulationInfoNew(this.group);
+            if (resp && resp.code == 200 && resp.data) {
+                if (!resp.data.dataError) {
+                    this.$store.dispatch('scriptRecord/updateSimulationPause', resp.data.pause); // 是否暂停判断
+                    this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${timeFormat(resp.data.systemTime)}`));
+                    this.$store.dispatch('training/countTime');
+                    this.planRunning = resp.data.planRunning;
+                    if (resp.data.planRunning) {
+                        this.$store.commit('training/start');
+                    }
+                } else {
+                    this.$messageBox('此地图数据正在维护中,无法运行！');
+                }
+                this.dataError = resp.data.dataError;
+            }
+        },
+        start(model) { // 开始仿真
+            const data = {
+                time: model.initTime
+            };
+            ranAsPlan(data, this.group).then(res => {
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+            }).catch(error => {
+                if (error.code == '5001') {
+                    this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5002') {
+                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5003') {
+                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5004') {
+                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '5000') {
+                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4000') {
+                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4001') {
+                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4002') {
+                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4003') {
+                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
+                } else if (error.code == '4004') {
+                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
+                } else {
+                    this.$messageBox('按计划行车异常,请退出重试!');
+                }
+            });
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.display-draft {
+    position: absolute;
+    float: right;
+    right: 15px;
+    bottom: 15px;
+}
+</style>
diff --git a/src/views/drts/scene/modify.vue b/src/views/drts/scene/modify.vue
index 0d1658d44..f54bebfd0 100644
--- a/src/views/drts/scene/modify.vue
+++ b/src/views/drts/scene/modify.vue
@@ -662,7 +662,7 @@ export default {
         getSummaries(param) {
             const { columns, data } = param;
             const sums = [];
-            columns.forEach((column, index) => {
+            columns && columns.forEach((column, index) => {
                 if (index === 0) {
                     sums[index] = '总分值';
                     return;
@@ -674,8 +674,10 @@ export default {
                             values.push(item.id);
                         }
                     });
+                    console.log(this.commandEvaluationRuleVOs);
                     sums[index] = values.reduce((prev, curr) => {
-                        const value = Number(this.commandEvaluationRuleVOs[curr].score);
+                        let value = 0;
+                        if (this.commandEvaluationRuleVOs[curr]) { value = Number(this.commandEvaluationRuleVOs[curr].score || 0); }
                         if (!isNaN(value)) {
                             return prev + value;
                         } else {
diff --git a/src/views/exam/detail/examDetail.vue b/src/views/exam/detail/examDetail.vue
index 46706c5ea..c435cab2d 100644
--- a/src/views/exam/detail/examDetail.vue
+++ b/src/views/exam/detail/examDetail.vue
@@ -55,7 +55,6 @@ import { getExamLessonDetail } from '@/api/management/exam';
 import { generateExamList } from '@/api/management/userexam';
 import { getPublishLessonDetail } from '@/api/jmap/lesson';
 import { PermissionType } from '@/scripts/ConstDic';
-// import { getDetailList } from '@/api/management/dictionary';
 import { mapGetters } from 'vuex';
 import { launchFullscreen } from '@/utils/screen';
 import { UrlConfig } from '@/scripts/ConstDic';
diff --git a/src/views/jlmap3d/edit/component/index.vue b/src/views/jlmap3d/edit/component/index.vue
index a75f96293..10376f451 100644
--- a/src/views/jlmap3d/edit/component/index.vue
+++ b/src/views/jlmap3d/edit/component/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="mapDraft" id="mapMain">
-        sssssssssssssssssssssss
+        
     </div>
 </template>
 <script>
diff --git a/src/views/jlmap3d/edit/component/map3dlist.vue b/src/views/jlmap3d/edit/component/map3dlist.vue
index 408b026b3..84cb83384 100644
--- a/src/views/jlmap3d/edit/component/map3dlist.vue
+++ b/src/views/jlmap3d/edit/component/map3dlist.vue
@@ -3,7 +3,6 @@
     <div slot="header" class="clearfix">
       <span>草稿地图列表</span>
       <el-button type="text" style="float: right; padding: 3px 0" @click="createMap">新建</el-button>
-      <!-- <el-button type="text" v-if="$route.params.mapId != 0" @click="doExportFront" style="float: right; padding: 3px 0; margin-right: 9px;">导出地图</el-button> -->
       <el-button type="text" class="uploadDemo">
         <input
           ref="files"
@@ -49,7 +48,7 @@
 
 <script>
 import { DeviceMenu } from '@/scripts/ConstDic';
-import { getMapTree, getMapDetail, postBuildMapImport } from '@/api/jmap/mapdraft';
+import { getMapTree, postBuildMapImport } from '@/api/jmap/mapdraft';
 import MapOperateMenu from './operateMenu';
 import MapCreate from './create';
 import XLSX from 'xlsx';
@@ -57,239 +56,199 @@ import { translate, translateSheetTitle } from '@/scripts/translate';
 import { sheet_to_json } from '@/utils/Export2Excel';
 
 export default {
-	name: 'MapListDraft',
-	components: {
-		MapCreate,
-		MapOperateMenu
-	},
-	data() {
-		return {
-			loading: true,
-			activeName: 'first',
-			mapList: [],
-			defaultProps: {
-				children: 'children',
-				label: 'name'
-			},
-			editModel: {},
-			skinCode: '',
-			point: {
-				x: 0,
-				y: 0
-			}
-		};
-	},
-	computed: {
-		height() {
-			return this.$store.state.app.height - 115;
-		}
-	},
-	mounted() {
-		this.refresh();
-	},
-	methods: {
-		getSkinCode(node) {
-			let next = node;
-			while (next) {
-				if (next.data && next.data.type == 'skin') {
-					this.skinCode = next.data.id;
-					break;
-				}
-				next = next.parent;
-			}
-		},
-		showContextMenu(e, obj, node, vueElem) {
-			if (obj && obj.type == 'map') {
-				e.preventDefault();
-				const menu = DeviceMenu.Map;
+    name: 'MapListDraft',
+    components: {
+        MapCreate,
+        MapOperateMenu
+    },
+    data() {
+        return {
+            loading: true,
+            activeName: 'first',
+            mapList: [],
+            defaultProps: {
+                children: 'children',
+                label: 'name'
+            },
+            editModel: {},
+            skinCode: '',
+            point: {
+                x: 0,
+                y: 0
+            }
+        };
+    },
+    computed: {
+        height() {
+            return this.$store.state.app.height - 115;
+        }
+    },
+    mounted() {
+        this.refresh();
+    },
+    methods: {
+        getSkinCode(node) {
+            let next = node;
+            while (next) {
+                if (next.data && next.data.type == 'skin') {
+                    this.skinCode = next.data.id;
+                    break;
+                }
+                next = next.parent;
+            }
+        },
+        showContextMenu(e, obj, node, vueElem) {
+            if (obj && obj.type == 'map') {
+                e.preventDefault();
+                const menu = DeviceMenu.Map;
 
-				this.point = {
-					x: e.clientX,
-					y: e.clientY
-				};
-				this.editModel = obj;
-				this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
-			}
-		},
-		handleNodeClick(obj, node) {
-			this.getSkinCode(node);
-			if (obj && obj.type == 'map') {
-				this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
-				this.$emit('mapSelected', { mapInfo: obj, view: 'draft' });
-			}
-		},
-		editRoute() {
-			this.$emit('mapSelected', { mapInfo: this.editModel, view: 'route' });
-		},
-		setSwitch() {
-			this.$emit('mapSelected', { mapInfo: this.editModel, view: 'swtich' });
-		},
-		pathUnit() {
-			this.$emit('mapSelected', { mapInfo: this.editModel, view: 'path' });
-		},
-		createMap() {
-			this.$refs.mapCreate.show();
-		},
-		refresh() {
-			this.mapList = [];
-			this.loading = true;
-			getMapTree().then(response => {
-				this.loading = false;
-				this.mapList = response.data;
-				this.$refs.tree.setCurrentKey(this.$route.params.mapId); // value 绑定的node-key
-			}).catch(() => {
-				this.$messageBox('刷新树级列表失败');
-				this.loading = false;
-			});
-		},
+                this.point = {
+                    x: e.clientX,
+                    y: e.clientY
+                };
+                this.editModel = obj;
+                this.$store.dispatch('menuOperation/setPopMenu', { position: this.point, menu: menu });
+            }
+        },
+        handleNodeClick(obj, node) {
+            this.getSkinCode(node);
+            if (obj && obj.type == 'map') {
+                this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
+                this.$emit('mapSelected', { mapInfo: obj, view: 'draft' });
+            }
+        },
+        editRoute() {
+            this.$emit('mapSelected', { mapInfo: this.editModel, view: 'route' });
+        },
+        setSwitch() {
+            this.$emit('mapSelected', { mapInfo: this.editModel, view: 'swtich' });
+        },
+        pathUnit() {
+            this.$emit('mapSelected', { mapInfo: this.editModel, view: 'path' });
+        },
+        createMap() {
+            this.$refs.mapCreate.show();
+        },
+        refresh() {
+            this.mapList = [];
+            this.loading = true;
+            getMapTree().then(response => {
+                this.loading = false;
+                this.mapList = response.data;
+                this.$refs.tree.setCurrentKey(this.$route.params.mapId); // value 绑定的node-key
+            }).catch(() => {
+                this.$messageBox('刷新树级列表失败');
+                this.loading = false;
+            });
+        },
 
-		importf() { // 导入
-			const loading = this.$loading({
-				lock: true,
-				text: '正在导入中...',
-				spinner: 'el-icon-loading',
-				background: 'rgba(0, 0, 0, 0.7)'
-			});
-			const obj = this.$refs.files;
-			let wb;
-			if (!obj.files) return;
-			const f = obj.files[0];
-			const reader = new FileReader();
-			const that = this;
-			reader.onload = function (e) {
-				const data = e.target.result;
-				if (that.rABS) {
-					wb = XLSX.read(btoa(that.fixdata(data)), {// 手动转化
-						type: 'base64'
-					});
-				} else {
-					wb = XLSX.read(data, {
-						type: 'binary'
-					});
-				}
-				const resultJSONData = { 'devices': {} };
-				for (const index in wb.Sheets) {
+        importf() { // 导入
+            const loading = this.$loading({
+                lock: true,
+                text: '正在导入中...',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+            });
+            const obj = this.$refs.files;
+            let wb;
+            if (!obj.files) return;
+            const f = obj.files[0];
+            const reader = new FileReader();
+            const that = this;
+            reader.onload = function (e) {
+                const data = e.target.result;
+                if (that.rABS) {
+                    wb = XLSX.read(btoa(that.fixdata(data)), {// 手动转化
+                        type: 'base64'
+                    });
+                } else {
+                    wb = XLSX.read(data, {
+                        type: 'binary'
+                    });
+                }
+                const resultJSONData = { 'devices': {} };
+                for (const index in wb.Sheets) {
 
-					const titleNum = that.formatSheetTitle(index);
-					const key = translateSheetTitle.sheetName[titleNum];
+                    const titleNum = that.formatSheetTitle(index);
+                    const key = translateSheetTitle.sheetName[titleNum];
 
-					const filterVal = that.handelData(key);
-					const jsonData = sheet_to_json(wb.Sheets[index]);
-					const data = that.formatJson(filterVal, jsonData, key);
-					if (key === 'base') {
-						Object.assign(resultJSONData, data[0]);
-					} else if (key === 'skinVO') {
-						resultJSONData['devices'][key] = data[0];
-					} else {
-						resultJSONData['devices'][key] = data;
-					}
-				}
-				that.resultJSON = resultJSONData;
-				if (that.resultJSON) {
-					postBuildMapImport(that.resultJSON).then(res => {
-						loading.close();
-						that.$message.success('导入成功！');
-						that.refresh();
-					}).catch(error => {
-						loading.close();
-						that.$message.error('导入失败' + error.message);
-					});
-				}
-				obj.value = ''; // 清空上次导入文件
-			};
-			if (that.rABS) {
-				reader.readAsArrayBuffer(f);
-			} else {
-				reader.readAsBinaryString(f);
-			}
-		},
-		// 转换数据格式
-		handelData(key) {
-			const tHeader = [];
-			const tHeaderF = [];
-			if (translate[key]) {
-				translate[key].columns.forEach(item => {
-					tHeader.push(item.tHeader);
-					tHeaderF.push(item.key);
-				});
-			}
-			const filterVal = {
-				tHeader: tHeader,
-				tHeaderF: tHeaderF
-			};
-			return filterVal;
-		},
-		// 文件流转BinaryString
-		fixdata(data) {
-			var o = '';
-			var l = 0;
-			var w = 10240;
-			for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)));
-			o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)));
-			return o;
-		},
-		// 转换属性名称 格式
-		formatJson(filterVal, jsonData, key) {
-			jsonData.map((item, index) => {
-				const json = {};
-				filterVal.tHeader.map((j, o) => {
-					if (item[j] != undefined) {
-						json[filterVal.tHeaderF[o]] = translate[key].columns[o].formatter(item[j]);
-					}
-				});
-				jsonData.splice(index, 1, json);
-			});
-			return jsonData;
-		},
-		// 转换sheet名字
-		formatSheetTitle(title) {
-			let index;
-			translateSheetTitle.sheetTitle.forEach((v, i) => {
-				if (title == v) index = i;
-			});
-			return index;
-		},
-
-		// 前端方式导出
-		async doExportFront() {
-			const res = await getMapDetail(this.$route.params.mapId);
-			const resultData = res.data;
-			if (resultData === false) {
-				return;
-			}
-			const self = this;
-                import('@/utils/Export2Excel').then(excel => {
-                	self.queryExportData(resultData).then(data => {
-                		excel.export_json_excel(data, resultData.name);
-
-                	}).catch(error => {
-                		self.$message.error('导出执行异常：' + error.message);
-                	});
+                    const filterVal = that.handelData(key);
+                    const jsonData = sheet_to_json(wb.Sheets[index]);
+                    const data = that.formatJson(filterVal, jsonData, key);
+                    if (key === 'base') {
+                        Object.assign(resultJSONData, data[0]);
+                    } else if (key === 'skinVO') {
+                        resultJSONData['devices'][key] = data[0];
+                    } else {
+                        resultJSONData['devices'][key] = data;
+                    }
+                }
+                that.resultJSON = resultJSONData;
+                if (that.resultJSON) {
+                    postBuildMapImport(that.resultJSON).then(res => {
+                        loading.close();
+                        that.$message.success('导入成功！');
+                        that.refresh();
+                    }).catch(error => {
+                        loading.close();
+                        that.$message.error('导入失败' + error.message);
+                    });
+                }
+                obj.value = ''; // 清空上次导入文件
+            };
+            if (that.rABS) {
+                reader.readAsArrayBuffer(f);
+            } else {
+                reader.readAsBinaryString(f);
+            }
+        },
+        // 转换数据格式
+        handelData(key) {
+            const tHeader = [];
+            const tHeaderF = [];
+            if (translate[key]) {
+                translate[key].columns.forEach(item => {
+                    tHeader.push(item.tHeader);
+                    tHeaderF.push(item.key);
                 });
-		},
-		// 格式化数据列表
-		queryExportData(data) {
-			return new Promise((resolve, reject) => {
-				const result = {
-					base: []
-				};
-				const obj = {};
-				for (const i in data) {
-					if (typeof data[i] != 'object') {
-						obj[i] = data[i];
-					} else if (data[i] instanceof Array) {
-						if (data[i].length) {
-							result[i] = [...data[i]];
-						}
-					} else if (data[i] instanceof Object) {
-						obj[i] = data[i];
-					}
-				}
-				result.base.push(obj);
-				resolve(result);
-			});
-		}
-	}
+            }
+            const filterVal = {
+                tHeader: tHeader,
+                tHeaderF: tHeaderF
+            };
+            return filterVal;
+        },
+        // 文件流转BinaryString
+        fixdata(data) {
+            var o = '';
+            var l = 0;
+            var w = 10240;
+            for (; l < data.byteLength / w; ++l) o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w, l * w + w)));
+            o += String.fromCharCode.apply(null, new Uint8Array(data.slice(l * w)));
+            return o;
+        },
+        // 转换属性名称 格式
+        formatJson(filterVal, jsonData, key) {
+            jsonData.map((item, index) => {
+                const json = {};
+                filterVal.tHeader.map((j, o) => {
+                    if (item[j] != undefined) {
+                        json[filterVal.tHeaderF[o]] = translate[key].columns[o].formatter(item[j]);
+                    }
+                });
+                jsonData.splice(index, 1, json);
+            });
+            return jsonData;
+        },
+        // 转换sheet名字
+        formatSheetTitle(title) {
+            let index;
+            translateSheetTitle.sheetTitle.forEach((v, i) => {
+                if (title == v) index = i;
+            });
+            return index;
+        }
+    }
 };
 </script>
 <style scoped rel="stylesheet/scss" lang="scss">
diff --git a/src/views/jlmap3d/trafficplan/component/stationdata.vue b/src/views/jlmap3d/trafficplan/component/stationdata.vue
new file mode 100644
index 000000000..f5b748d0c
--- /dev/null
+++ b/src/views/jlmap3d/trafficplan/component/stationdata.vue
@@ -0,0 +1,125 @@
+<template>
+  <div class="stationdata">
+    <el-row class="tac">
+      <el-col :span="12">
+        <el-menu
+          default-active="2"
+          class="el-menu-vertical-demo datatab"
+          @open="handleOpen"
+          @close="handleClose"
+          background-color="#545c64"
+          text-color="#fff"
+          active-text-color="#ffd04b">
+
+          <el-submenu index="1">
+            <template slot="title">
+              <span>当前车站总人数:</span>
+              <span>{{allPassers}}</span>
+            </template>
+          </el-submenu>
+
+          <el-submenu index="2">
+            <template slot="title">
+              <span>当前进站流量:</span>
+              <span>{{nowInStationPassers}}</span>
+            </template>
+          </el-submenu>
+
+          <!-- <el-submenu index="3">
+            <template slot="title">
+              <span>当前出站客流:</span>
+              <span>{{nowOutStationPassers}}</span>
+            </template>
+          </el-submenu> -->
+
+          <el-submenu index="4">
+            <template slot="title">
+              <span>上行站台等待旅客:</span>
+              <span>{{topWaitPassers}}</span>
+            </template>
+          </el-submenu>
+
+          <el-submenu index="5">
+            <template slot="title">
+              <span>下行站台等待旅客:</span>
+              <span>{{downWaitPassers}}</span>
+            </template>
+          </el-submenu>
+
+          <el-submenu index="6">
+            <template slot="title">
+              <span>其他数据</span>
+            </template>
+          </el-submenu>
+        </el-menu>
+      </el-col>
+    </el-row>
+
+  </div>
+
+</template>
+
+<script>
+
+export default {
+  name: 'StationData',
+  components: {
+
+  },
+  data() {
+    return {
+      allPassers:"30人",
+      topWaitPassers:"12人",
+      downWaitPassers:"13人",
+      nowInStationPassers:"0 人/30s",
+      nowOutStationPassers:"0 人",
+    }
+  },
+  beforeDestroy() {
+
+
+  },
+  watch: {
+
+   },
+  methods: {
+    handleOpen(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    handleClose(key, keyPath) {
+      console.log(key, keyPath);
+    },
+    updatePasserData(humanlistdata,topWaitPassersdata,downWaitPassersdata,outStationPassersdata,speed){
+      this.topWaitPassers = topWaitPassersdata+"人";
+      this.downWaitPassers = downWaitPassersdata+"人";
+      // this.nowOutStationPassers = outStationPassersdata+"人";
+
+      if(speed == undefined){
+        this.nowInStationPassers = 0 + "人/30s";
+      }else{
+        this.nowInStationPassers = speed + "人/30s";
+      }
+      this.allPassers = humanlistdata+topWaitPassersdata+downWaitPassersdata+outStationPassersdata+"人";
+    },
+    updatePasserOut(data){
+
+    },
+  },
+  mounted() {
+      //this.init();
+      window.updatePasserData = this.updatePasserData;
+  }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.stationdata{
+  top:100px;
+  left:0;
+  position: absolute;
+}
+.datatab{
+  width:250px;
+}
+</style>
diff --git a/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue
new file mode 100644
index 000000000..e1ab6ae3e
--- /dev/null
+++ b/src/views/jlmap3d/trafficplan/jl3dtrafficplan.vue
@@ -0,0 +1,222 @@
+<template>
+  <div class="jl3dtrafficplan">
+    <div id="jl3d" :class="lineCode=='07'?'jl3ddraw':'jl3ddraw1'" />
+    <div class="station" :style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}">
+      <div style="margin-top:5%;font-size: 30px;">当前车站:</div>
+      <el-select v-model="value" class="listmenu" placeholder="当前车站" @change="currentsel">
+        <el-option
+          v-for="item in stationlist"
+          :key="item.name"
+          :label="item.name"
+          :value="item.name"
+          :disabled="item.disabled"
+        />
+      </el-select>
+    </div>
+    <Station-Data>
+    </Station-Data>
+
+    <!-- <div class="menutop">
+      <el-button-group>
+        <el-button type="primary" @click="switchauto">列车车厢视角</el-button>
+      </el-button-group>
+    </div> -->
+
+    <div class="menudown">
+      <el-button-group>
+        <el-button v-show="isCctv" type="primary" @click="back">退出</el-button>
+      </el-button-group>
+    </div>
+  </div>
+
+</template>
+<script>
+import Vue from 'vue';
+import { Jl3dTrafficPlan } from '@/jlmap3d/jl3dtrafficplan/jl3dtrafficplan.js';
+import { ProjectIcon, loginInfo } from '@/scripts/ProjectConfig';
+
+import { getSessionStorage } from '@/utils/auth';
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+
+import StationData from '@/views/jlmap3d/trafficplan/component/stationdata';
+
+export default {
+  name: 'TrafficPlan',
+  components: {
+    StationData,
+  },
+  data() {
+    return {
+      localStatic:JL3D_LOCAL_STATIC,
+      jl3d: null,
+      rendermode:'监控视角',
+      renderswitch:false,
+      stationlist:[],
+      value:'',
+      isCctv:true,
+      group:'',
+      mapId:'',
+      lineCode:'',
+      loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts','bjd']
+    };
+  },
+  computed: {
+    code() {
+      return this.$route.query.code;
+    },
+    project() {
+      return getSessionStorage('project');
+    },
+  },
+  watch: {
+
+  },
+  created() {
+    if (this.loadingProjectList.includes(this.$route.query.project)) {
+      this.$store.dispatch('app/transitionAnimations');
+    }
+    document.querySelector("link[rel*='icon']").href = loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
+  },
+  mounted() {
+    this.group = this.$route.query.group;
+    this.mapId = this.$route.query.mapId;
+    this.lineCode = this.$route.query.lineCode;
+    this.init();
+    window.updatestationlist = this.updatestationlist;
+    if (this.$route.query.type == 'CCTV') {
+      this.isCctv = false;
+    }
+  },
+
+  beforeDestroy() {
+  },
+  methods: {
+    init: function () {
+      // let mapdata = this.$store.state.socket.device;
+      const dom = document.getElementById('jl3d');
+      this.jl3d = new Jl3dTrafficPlan(dom, this.$route.query.mapid, this.$route.query.group, 'normal');
+    },
+    switchrender() {
+      if (this.renderswitch == true) {
+          this.rendermode = '退出监控';
+          this.renderswitch = false;
+          this.jl3d.switchviews('freeview');
+      } else {
+          this.rendermode = '监控视角';
+          this.renderswitch = true;
+          this.jl3d.switchviews('4views');
+      }
+    },
+
+    updatestationlist(list) {
+      // console.log(list);
+      this.value = list[0].name;
+      this.stationlist = list;
+    },
+    currentsel(selVal) {
+      this.jl3d.changestation(selVal);
+      // let oldgroupnum = this.groupnum;
+      // this.value = selVal;
+    },
+    back() {
+        window.close();
+    }
+  }
+};
+</script>
+<style scoped>
+	/* #jl3d {
+		width: 937px;
+		height: 937px;
+	} */
+	.jl3dtrafficplan{
+		width: 100%;
+		height: 100%;
+	}
+  .jl3ddraw1{
+    position: absolute;
+		float: right;
+    top:0%;
+		/* left: 0; */
+		width: 100%;
+		height: 100%;
+		z-index: 0;
+  }
+	.jl3ddraw {
+    position: absolute;
+		float: right;
+    top:0%;
+		/* left: 0; */
+		width: 50%;
+		height: 100%;
+		z-index: 0;
+	}
+	.jlReal3d{
+		position: absolute;
+    top:0%;
+		left: 50%;
+		width: 50%;
+		height: 100%;
+		z-index: 0;
+    font-size:0;
+	}
+	.realCctv1{
+		position: absolute;
+		width:50%;
+		height:50%;
+		left:0;
+		top:0;
+	}
+  .realCctv2{
+    position: absolute;
+		width:50%;
+		height:50%;
+		left:50%;
+		top:0;
+  }
+  .realCctv3{
+    position: absolute;
+		width:50%;
+		height:50%;
+		left:0;
+		top:50%;
+  }
+  .realCctv4{
+    position: absolute;
+		width:50%;
+		height:50%;
+		left:50%;
+		top:50%;
+  }
+	.station{
+		width:250px;
+		height:100px;
+		top:0;
+		left:0;
+		text-align: center;
+		/* right:500px; */
+		/* bottom:0; */
+		position: absolute;
+		background-size: 100% 100%;
+		border-radius:10px;
+	}
+	.listmenu{
+		/* top:50%; */
+	}
+	.menutop{
+		top:0;
+    right:0;
+		position:absolute;
+	}
+	.menudown{
+		bottom:0;
+		right:0;
+		position:absolute;
+	}
+	#canvastexture {
+		position: absolute;
+		float: left;
+		left: 0;
+		z-index: -12;
+	}
+</style>
diff --git a/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue
new file mode 100644
index 000000000..ad00e8717
--- /dev/null
+++ b/src/views/jlmap3d/trafficplan/jl3dtraffictrain.vue
@@ -0,0 +1,355 @@
+<template>
+  <div class="jl3dtrafficplan">
+    <div id="jl3d" :class="lineCode=='07'?'jl3ddraw':'jl3ddraw1'" />
+    <div class="station" :style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}">
+      <div style="margin-top:5%;font-size: 30px;">当前列车:</div>
+      <el-select v-model="value" class="listmenu" placeholder="请选择列车" @visible-change="updateTrainList" @change="updateTrainCode">
+        <el-option
+          v-for="item in trainlist"
+          :key="item.code"
+          :label="item.text"
+          :value="item.code"
+
+        />
+      </el-select>
+    </div>
+    <div class="trunklist">
+      <div class="trunk" :class="{active:index==isActive}"
+      :style="{'background-image': 'url('+localStatic+trunkAsse+')'}"
+      v-for="(trunkAsse,index) in trunkAssetList" @click="assetSelect(index)" >
+      </div>
+    </div>
+
+    <div class="traindata">
+      <el-row class="tac">
+        <el-col :span="12">
+          <el-menu
+            default-active="0"
+             :default-openeds="openeds"
+            class="el-menu-vertical-demo datatab"
+
+
+            background-color="#545c64"
+            text-color="#fff"
+            active-text-color="#ffd04b">
+
+            <el-submenu index="1">
+              <template slot="title">
+                <span>当前列车乘客总数:{{allPassers}}人</span>
+              </template>
+            </el-submenu>
+
+            <el-submenu index="2">
+              <template slot="title">
+                <span>车厢一</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[0].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[0].percent}}</p>
+            </el-submenu>
+
+            <el-submenu index="3">
+              <template slot="title">
+                <span>车厢二</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[1].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[1].percent}}</p>
+            </el-submenu>
+
+            <el-submenu index="4">
+              <template slot="title">
+                <span>车厢三</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[2].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[2].percent}}</p>
+            </el-submenu>
+
+            <el-submenu index="5">
+              <template slot="title">
+                <span>车厢四</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[3].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[3].percent}}</p>
+            </el-submenu>
+
+            <el-submenu index="6">
+              <template slot="title">
+                <span>车厢五</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[4].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[4].percent}}</p>
+            </el-submenu>
+
+            <el-submenu index="7">
+              <template slot="title">
+                <span>车厢六</span>
+              </template>
+              <p class = "takedata">车厢乘客数:{{takelist[5].num}}人</p>
+              <p class = "takedata">车厢载客率:{{takelist[5].percent}}</p>
+            </el-submenu>
+
+          </el-menu>
+        </el-col>
+      </el-row>
+
+    </div>
+
+
+
+    <div class="menudown">
+      <el-button-group>
+        <el-button v-show="isCctv" type="primary" @click="back">退出</el-button>
+      </el-button-group>
+    </div>
+  </div>
+
+</template>
+<script>
+import Vue from 'vue';
+import { Jl3dTrafficTrain } from '@/jlmap3d/jl3dtrafficplan/jl3dtraffictrain.js';
+
+import { JL3D_LOCAL_STATIC } from '@/api/jlmap3d/assets3d.js';
+export default {
+    name: 'TrafficTrain',
+    components: {
+    },
+    data() {
+      return {
+
+        isActive:0,
+        localStatic:JL3D_LOCAL_STATIC,
+        openeds:['2','3','4','5','6','7'],
+        trunkAssetList:[
+          '/trafficplan/trunkhead.png',
+          '/trafficplan/trunkbody.png',
+          '/trafficplan/trunkbody.png',
+          '/trafficplan/trunkbody.png',
+          '/trafficplan/trunkbody.png',
+          '/trafficplan/trunkback.png'
+        ],
+        jl3d: null,
+        rendermode:'监控视角',
+        renderswitch:false,
+        takelimit:220,
+        takelist:[
+          {num:'',percent:''},{num:'',percent:''},{num:'',percent:''},{num:'',percent:''},{num:'',percent:''},{num:'',percent:''},
+        ],
+        trainlist:[],
+        value:'',
+        isCctv:true,
+        allPassers:0,
+        loadingProjectList: ['login', 'design', 'xty', 'designxty', 'gzb', 'designxty', 'xadt', 'designxadt', 'drts', 'designdrts','bjd']
+      };
+    },
+    computed: {
+        code() {
+            return this.$route.query.code;
+        },
+        lineCode() {
+            return this.$route.query.lineCode;
+        }
+    },
+    watch: {
+
+    },
+
+    created() {
+        if (this.loadingProjectList.includes(this.$route.query.project)) {
+            this.$store.dispatch('app/transitionAnimations');
+        }
+        // document.querySelector("link[rel*='icon']").href = loginInfo[this.$route.query.project].linkIcon || ProjectIcon[this.$route.query.project];
+    },
+    mounted() {
+
+        this.init();
+        this.takelist = this.getnum(this.allPassers,6);
+        // console.log(this.takelist);
+        if (this.$route.query.type == 'CCTV') {
+            this.isCctv = false;
+        }
+
+        window.updateTrainNum = this.updateTrainNum;
+    },
+
+    beforeDestroy() {
+    },
+    methods: {
+        init: function () {
+            // let mapdata = this.$store.state.socket.device;
+            const dom = document.getElementById('jl3d');
+            this.jl3d = new Jl3dTrafficTrain(dom, this.$route.query.mapid, this.$route.query.group, 'normal');
+        },
+        assetSelect(index){
+          // console.log(index);
+          this.isActive=index;
+          this.jl3d.switchcamera(index+'');
+        },
+
+        switchrender() {
+            if (this.renderswitch == true) {
+                this.rendermode = '退出监控';
+                this.renderswitch = false;
+                this.jl3d.switchviews('freeview');
+            } else {
+                this.rendermode = '监控视角';
+                this.renderswitch = true;
+                this.jl3d.switchviews('4views');
+            }
+        },
+        // updateTrainCode(codeData){
+        //   this.jl3d.updateNowTrainCode(codeData);
+        // },
+        updateTrainList(){
+          this.trainlist = [];
+          let newTrainList = this.jl3d.getTrainList();
+          let newRunList = this.jl3d.getRunList();
+          for(let i=0;i<newRunList.length;i++){
+            this.trainlist.push(newTrainList[newRunList[i].code]);
+          }
+
+
+          // console.log(this.trainlist);
+          // if(){
+          //
+          // }
+          // // console.log(this.trainlist);
+        },
+        updateTrainCode(selVal) {
+          // console.log(selVal);
+            // this.jl3d.changeTrain(selVal);
+            this.isActive=0;
+            this.jl3d.updateNowTrainCode(selVal);
+            this.jl3d.switchcamera(0+'');
+
+
+            // let oldgroupnum = this.groupnum;
+            // this.value = selVal;
+        },
+        updateTrainNum(dataList){
+          this.takelist = dataList;
+          this.allPassers = 0;
+          for(let i = 0;i<this.takelist.length;i++){
+            this.allPassers = this.allPassers + this.takelist[i].num;
+          }
+
+        },
+        getnum(num,pnum){
+          let re = [];
+          let base = Math.floor(num/pnum);
+          let reset = num%pnum;
+          for(let i=0;i<pnum;i++){
+            let nownum = base+(i<reset?1:0);
+            let newtraindata = {
+              num:nownum,
+              percent:parseInt(nownum/220*100)+"%",
+            }
+            re.push(newtraindata);
+          }
+          return re;
+        },
+        back() {
+            window.close();
+        }
+    }
+};
+</script>
+<style scoped>
+	/* #jl3d {
+		width: 937px;
+		height: 937px;
+	} */
+	.jl3dtrafficplan{
+		width: 100%;
+		height: 100%;
+	}
+  .jl3ddraw1{
+    position: absolute;
+		float: right;
+    top:0%;
+		/* left: 0; */
+		width: 100%;
+		height: 100%;
+		z-index: 0;
+  }
+	.jl3ddraw {
+    position: absolute;
+		float: right;
+    top:0%;
+		/* left: 0; */
+		width: 50%;
+		height: 100%;
+		z-index: 0;
+	}
+	.jlReal3d{
+		position: absolute;
+    top:0%;
+		left: 50%;
+		width: 50%;
+		height: 100%;
+		z-index: 0;
+    font-size:0;
+	}
+
+	.station{
+		width:250px;
+		height:100px;
+		top:0;
+		left:0;
+		text-align: center;
+		/* right:500px; */
+		/* bottom:0; */
+		position: absolute;
+		background-size: 100% 100%;
+		border-radius:10px;
+	}
+
+  .trunklist{
+    width:3%;
+    height:70%;
+    top:150px;
+    left:1%;
+    position: absolute;
+    background-color: #ffffff;
+    border-radius:10px;
+
+  }
+  .trunk{
+    width:95%;
+    height:16.6%;
+    top:0.2%;
+    left:2.5%;
+    position:relative;
+    background-size: 100% 100%;
+  }
+  .active{
+    border-style:solid;
+    border-color: blue;
+  }
+
+  .takedata{
+    text-align: center;
+    color: rgb(255, 255, 255);
+  }
+
+	.listmenu{
+		/* top:50%; */
+	}
+	.menutop{
+		top:0;
+    right:0;
+		position:absolute;
+	}
+	.menudown{
+		bottom:0;
+		right:0;
+		position:absolute;
+	}
+  .traindata{
+    top:0;
+    right:0;
+    position: absolute;
+  }
+  .datatab{
+    width:250px;
+  }
+
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 043905dde..ebc7b37c3 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -158,7 +158,6 @@ import { loginInfo, ProjectIcon, ProjectLoginStyleList, VersionBaseNoShow, MainB
 import { removeToken, getToken } from '@/utils/auth';
 import LangStorage from '@/utils/lang';
 import FloatPart from './floatPart';
-import { getIsSignUp } from '@/api/competition';
 import { getSimulationInfoNew } from '@/api/simulation';
 import { getSessionStorage } from '@/utils/auth';
 import { launchFullscreen } from '@/utils/screen';
@@ -473,23 +472,7 @@ export default {
             this.loading = this.project === 'drts' || false;
             this.tipsMsg = '';
             removeSessionStorage('againEnter');
-            if (this.$route.query.raceId) {
-                if (this.$route.path.includes('jsxt/login')) {
-                    getIsSignUp(this.$route.query.raceId, { isLogin: true }).then(res => {
-                        if (res.data) {
-                            setSessionStorage('raceId', this.$route.query.raceId);
-                            this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
-                        } else {
-                            this.$messageBox('您未报名该竞赛，所以无法进入竞赛系统');
-                        }
-                    }).catch(() => {
-                        this.$messageBox('登陆竞赛系统失败，请稍后重试');
-                    });
-                } else {
-                    setSessionStorage('raceId', this.$route.query.raceId);
-                    this.$router.push({ path: this.path, query:{ raceId:this.$route.query.raceId } });
-                }
-            } else if (this.$route.query.projectDevice) {
+            if (this.$route.query.projectDevice) {
                 getLoginInfo(getToken()).then(res => {
                     getSimulationInfoNew(res.data.group).then(resp => {
                         const query = {
@@ -554,14 +537,14 @@ export default {
                         }
                     });
                 });
-            } else if (this.project === 'drts') {
+            } else if (this.project === 'drts' || this.project === 'bjd') {
                 getLoginInfo(getToken()).then(res => {
                     getSimulationInfoNew(res.data.group).then(resp => {
                         this.$store.dispatch('app/transitionAnimations');
                         this.$router.push({ path: `/displayNew/demon`, query: {
                             lineCode: resp.data.map.lineCode,
                             group: res.data.group,
-                            prdType: '02',
+                            prdType: resp.data.prodType,
                             mapId: resp.data.map.id,
                             goodsId:'',
                             try:'0',
@@ -571,20 +554,6 @@ export default {
                         launchFullscreen();
                     });
                 });
-            } else if (this.project === 'bjd') {
-                getLoginInfo(getToken()).then(res => {
-                    getSimulationInfoNew(res.data.group).then(resp => {
-                        this.$store.dispatch('app/transitionAnimations');
-                        this.$router.push({ path: `/jointTrainingNew`, query: {
-                            lineCode: resp.data.map.lineCode,
-                            group: res.data.group,
-                            mapId: resp.data.map.id,
-                            project:this.project
-                        }});
-                        this.loading = false;
-                        launchFullscreen();
-                    });
-                });
             } else if (!this.$route.path.includes('jsxt/login') && !this.$route.path.includes('refereeJsxt/login')) {
                 this.$router.push({ path: this.path });
             } else {
diff --git a/src/views/newMap/chatView/chatBox.vue b/src/views/newMap/chatView/chatBox.vue
index a80d955c3..d06b39f69 100644
--- a/src/views/newMap/chatView/chatBox.vue
+++ b/src/views/newMap/chatView/chatBox.vue
@@ -3,22 +3,15 @@
     <div class="menuTrainListBtn" @click="clickBtn">
       <div v-if="userRole == 'DISPATCHER'">
         <div id="teleName" />
-        <p style="margin: 0;">调</p>
-        <p style="margin: 0;">度</p>
-        <p style="margin: 0;">电</p>
-        <p style="margin: 0;">话</p>
+        <div class="teleNameIn">调度电话</div>
       </div>
       <div v-if="userRole != 'AUDIENCE' && userRole != 'DISPATCHER'">
         <div id="teleName" />
-        <p style="margin: 0;">电</p>
-        <p style="margin: 0;">话</p>
+        <div class="teleNameIn">电话</div>
+      </div>
+      <div v-if="userRole == 'AUDIENCE'">
+        <div class="teleNameIn">通话记录</div>
       </div>
-      <template v-if="userRole == 'AUDIENCE'">
-        <p style="margin: 0;">通</p>
-        <p style="margin: 0;">话</p>
-        <p style="margin: 0;">记</p>
-        <p style="margin: 0;">录</p>
-      </template>
     </div>
     <div class="chat-box-main">
       <!-- v-if="!conversitionId && userRole !== 'AUDIENCE' && !commonConversation" -->
@@ -123,9 +116,9 @@
           </div> -->
         </div>
         <div class="chat-box-content chat-box-content_audience">
+          <!-- :project="project" -->
           <chat-content
             ref="chatContent"
-            :project="project"
             :is-answering="IsAnswering"
             :conversition-id="conversitionId"
             :conversition-member-list="conversitionMemberList"
@@ -513,7 +506,6 @@ export default {
             this.audioPlay = val;
         },
         '$store.state.scriptRecord.updateRoleId':function(val) {
-            // val
             if (this.conversitionStateMap[val]) {
                 this.treeData.forEach(item => {
                     if (item.children) {
@@ -619,7 +611,6 @@ export default {
             if (this.memberIdList.length || this.memberObject) {
                 this.createLoading = true;
                 if (this.memberIdList.length > 0) {
-                    // this.memberObject
                     this.treeData.forEach(data => {
                         this.memberIdList.forEach(memberId=>{
                             const member = data.children[memberId];
@@ -627,7 +618,6 @@ export default {
                         });
                     });
                 } else {
-                    // allTrain
                     if (this.memberObject == 'ALL_STATION') {
                         const stationList = Object.values(this.treeData[1].children);
                         const length = stationList.length;
@@ -673,7 +663,7 @@ export default {
                     // this.$message.success('创建会话成功！');
                     this.createLoading = false;
                 }).catch((error) => {
-                    this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建仿真失败！');
+                    this.$message.error(error.code == '3005' ? '创建会话失败:仿真会话成员忙线中！' : '创建会话失败:' + error.message);
                     this.createLoading = false;
                 });
             } else {
@@ -691,6 +681,7 @@ export default {
         },
         // 语音录制开始
         startRecording() {
+            this.audioPlay = true;
             const that = this;
             if (!this.recordSending) {
                 if (!this.recordSending && !this.recorders && !this.microphone) {
@@ -709,11 +700,13 @@ export default {
                             });
                             that.recorders.startRecording();
                             that.recordSending = true;
+                            that.audioPlay = false;
                             that.inter = setInterval(() => {
                                 if (that.seconds < 60) {
                                     that.seconds++;
                                 } else {
                                     clearInterval(that.inter);
+                                    that.stopRecording();
                                 }
                             }, 1000);
                         }, function (error) {
@@ -769,6 +762,7 @@ export default {
         },
         // 停止录制 发送语音
         stopRecording() {
+            this.audioPlay = true;
             const that = this;
             this.recorders.stopRecording(function(blobURL) {
                 clearInterval(that.inter);
@@ -779,10 +773,12 @@ export default {
                 sendSimulationConversition(that.group, that.conversitionId, fd)
                     .then((data) => {
                         that.textContent = '';
+                        that.audioPlay = false;
                     })
                     .catch(error => {
                         console.log(error);
                         that.$message.error('语音发送失败: ' + error.message);
+                        that.audioPlay = false;
                     });
                 if (that.microphone) {
                     that.microphone.stop();
@@ -1395,4 +1391,8 @@ export default {
     50%{opacity:0;}
     100% {opacity: 1;}
 }
+.teleNameIn{
+    width: 16px;
+    white-space: pre-wrap;
+}
 </style>
diff --git a/src/views/newMap/displayNew/demon/faultChoose.vue b/src/views/newMap/displayNew/demon/faultChoose.vue
index 05ec951ed..4485d6738 100644
--- a/src/views/newMap/displayNew/demon/faultChoose.vue
+++ b/src/views/newMap/displayNew/demon/faultChoose.vue
@@ -58,7 +58,7 @@
           <el-form ref="form" :model="faultRule" :inline="true" label-width="100px" style="margin-left:15px;">
             <el-form-item label="目标设备">
               <!-- faultRule.targetDeviceCode -->
-              <el-input v-model="targetDevice.name || targetDevice.code" disabled size="small" class="inputModelClass" style="width: 300px;" />
+              <el-input v-model="targetDeviceName" disabled size="small" class="inputModelClass" style="width: 300px;" />
               <!--<el-button :type="field === 'targetActive' ? 'danger' : 'primary'" size="small" @click="hover('targetActive')">{{ $t('map.activate') }}</el-button>-->
             </el-form-item>
             <!--<el-form-item label="触发方式">-->
@@ -123,7 +123,7 @@ import { getSimulationFaultRules, setFailureModeNew, deleteFailureRule, cancelFa
 import ConstConfig from '@/scripts/ConstConfig';
 import { FaultStatusEnum } from '@/scripts/FaultDicNew';
 import ModelType from '@/jmapNew/constant/deviceType';
-import { deviceFaultType} from '@/scripts/cmdPlugin/Config';
+import { deviceFaultType } from '@/scripts/cmdPlugin/Config';
 
 // 故障列表
 export default {
@@ -168,7 +168,8 @@ export default {
             ],
             field:'',
             triggerStatusList:[],
-            faultTypeList:[]
+            faultTypeList:[],
+            targetDeviceName: ''
         };
     },
     computed: {
@@ -191,6 +192,9 @@ export default {
             if (device && device.code) {
                 this.deviceSelect(device);
             }
+        },
+        targetDevice: function(device) {
+            this.targetDeviceName = this.targetDevice.name || this.targetDevice.code;
         }
     },
     mounted() {
@@ -231,13 +235,13 @@ export default {
 
             return name;
         },
-        formatTriggerStatus(condition) {
-            if (!condition.triggerDeviceType) {
-                return '';
-            }
-            const faultStatus = FaultStatusEnum[condition.triggerDeviceType];
-            return faultStatus[condition.triggerDeviceStatus];
-        },
+        // formatTriggerStatus(condition) {
+        //     if (!condition.triggerDeviceType) {
+        //         return '';
+        //     }
+        //     const faultStatus = FaultStatusEnum[condition.triggerDeviceType];
+        //     return faultStatus[condition.triggerDeviceStatus];
+        // },
         hover(field) {
             if (this.field == '') {
                 this.field = field;
diff --git a/src/views/newMap/displayNew/demon/messageBoard.vue b/src/views/newMap/displayNew/demon/messageBoard.vue
new file mode 100644
index 000000000..7e31a5a1b
--- /dev/null
+++ b/src/views/newMap/displayNew/demon/messageBoard.vue
@@ -0,0 +1,370 @@
+<template>
+  <el-dialog
+    id="elDialog"
+    title="留言板"
+    :visible.sync="dialogVisible"
+    fullscreen
+    :show-close="false"
+    center
+    :before-close="handleClose"
+  >
+    <el-card class="box-card" style="width: 80%;margin-left: 10%;padding: 20px;margin-bottom: 20px;background-color: rgba(255,255,255,0)">
+      <div v-if="postCommentList.length">
+        <template v-for="(item,i) in postCommentList">
+          <div :key="i" style="border: 1px solid #C0C0C0;border-radius: 5px;margin-bottom: 20px;box-shadow: 2px 2px 3px #808080;padding: 10px 20px;background-color: #fff">
+            <div style="margin-bottom: 10px;display: flex;align-items: center;">
+              <img :src="avatarUrl(item)" class="head_portrait">
+              <div style="display: inline-block;margin-right: 20px;margin-left:10px;font-size: 18px;color: #000;">{{ item.creatorNickName }}</div>
+              <div style="display: inline-block;">{{ item.createTime }}</div>
+            </div>
+            <div style="margin-left: 60px;" v-html="$escapeHTML(`${item.content}`)" />
+            <div style="width: 100%;display:flex;align-items: center;justify-content: flex-end;">
+              <!--<img :src="lickIcon" style="width: 20px;height: auto;margin-right: 30px;">-->
+              <!--<img :src="unlikeIcon" style="width: 20px;height: auto;margin-right: 30px;">-->
+              <img :src="replyIcon" style="width: 16px;height: auto;margin-right: 30px;cursor: pointer;" @click="replyLeaveMessage(item.id, i)">
+              <img v-if="userId == item.creatorId || superAdmin" :src="deleteIcon" style="width: 16px;height: auto;cursor:pointer;" @click="deleteMessage(item.id)">
+            </div>
+            <div v-if="item.comments && item.comments.total > 0" style="background: #F5F5F5;margin-top: 10px; width: calc(100% - 120px);margin-left: 60px; border-radius: 5px;padding: 1px 10px 10px;">
+              <div v-if="moreMessageId == item.id">
+                <template v-for="(elem,j) in allCommentList">
+                  <div :key="j" style="font-size: 14px;margin-top: 10px;">
+                    <span style="margin-right: 5px;">{{ computedCommentName(elem) }}</span>
+                    <span style="margin-right: 15px;">{{ elem.content }}</span>
+                    <span style="margin-right: 10px;">{{ elem.commentTime }}</span>
+                    <span style="color:#409EFF;cursor: pointer;margin-right: 10px;" @click="replyLeaveMessage(item.id, i,elem.id, elem.userNickname)">回复</span>
+                    <span v-if="userId == elem.userId || superAdmin" style="color:#409EFF;cursor: pointer;" type="text" @click="deleteComment(item.id, i, elem.id)">删除</span>
+                  </div>
+                </template>
+              </div>
+              <div v-else>
+                <template v-for="(elem,j) in item.comments.list">
+                  <div :key="j" style="font-size: 14px;margin-top: 18px;">
+                    <span style="margin-right: 5px;">{{ computedCommentName(elem) }}</span>
+                    <span style="margin-right: 15px;">{{ elem.content }}</span>
+                    <span style="margin-right: 10px;">{{ elem.commentTime }}</span>
+                    <span style="color:#409EFF;cursor: pointer;margin-right: 10px;" @click="replyLeaveMessage(item.id, i,elem.id, elem.userNickname)">回复</span>
+                    <span v-if="userId == elem.userId || superAdmin" style="color:#409EFF;cursor: pointer;" type="text" @click="deleteComment(item.id, i, elem.id)">删除</span>
+                  </div>
+                </template>
+              </div>
+              <div v-if="item.comments.total > 3 && moreMessageId != item.id" style="margin-top: 10px;">
+                <span class="view_more" @click="viewMoreComment(item)">{{ `共${item.comments.total}条回复,点击查看更多>>` }}</span>
+              </div>
+            </div>
+            <div v-if="replyMessageId == item.id" style="width: 80%;margin-left: 10%;text-align: center;">
+              <el-input :id="'answerInput' + item.id" v-model="commentContent" type="textarea" placeholder="请输入内容" maxlength="300" style="margin-top: 10px;" :autosize="{ minRows: 2, maxRows: 4}" show-word-limit @input="changeCommentContent" />
+              <div style="margin-top: 10px;">
+                <el-button type="danger" size="small" @click="commentMessage">回复</el-button>
+                <el-button size="small" @click="cancelComment">取消</el-button>
+              </div>
+            </div>
+          </div>
+        </template>
+      </div>
+      <div v-else style="text-align: center;width: 100%;height: 50px;line-height: 50px;font-size: 18px;color: #ccc;">
+        <span>暂无留言</span>
+      </div>
+      <div style="width: 100%;text-align: center;">
+        <el-pagination
+          :current-page.sync="pageNum"
+          :page-size="pageSize"
+          layout="total, prev, pager, next,jumper"
+          :total="total"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </el-card>
+    <quill-editor ref="quillEditor" v-model="content" style="width: 80%;margin-left: 10%;" placeholder="请输入内容" :margin-bottom="20" :unload-img="true" :no-handle-p="true" />
+    <span id="boardBottom" class="dialog-footer">
+      <el-button @click="handleClear">清空</el-button>
+      <el-button type="danger" @click="commitComment">留言</el-button>
+      <!--<el-button type="danger" @click="dialogVisible = false">返回</el-button>-->
+    </span>
+    <el-button size="mini" type="danger" style="position: fixed; right: 100px;top: 80px;width: 90px;" @click="goSlide">我要留言</el-button>
+    <el-button size="mini" style="position: fixed; right: 100px;top: 120px;width: 90px;" @click="dialogVisible = false">退出留言板</el-button>
+    <div v-show="imgShow" style="position: fixed;width: 100%;height: 100%;left: 0;top: 0;background: rgba(0,0,0,0.5);cursor: zoom-out;" @click="handelCloseImg">
+      <img id="targetImg" src="" style="position: fixed;top: 50%;left: 50%;transform: translate(-50%,-50%);min-width: 500px;max-height: 80%;height: auto;">
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { answerPost, queryMessagePagingByProjectCode, deleteMessageByAdmin, deleteMessageBySelf, commentLevelMessage, commentComents, queryMessageCommentList, deleteCommentByAdmin, deleteCommentBySelf, getPostByProjectCode } from '@/api/learn';
+import lick_icon from '@/assets/like.png';
+import unlike_icon from '@/assets/unlike.png';
+import reply_icon from '@/assets/reply.png';
+import delete_icon from '@/assets/delete.png';
+import { superAdmin } from '@/router/index_APP_TARGET';
+import { getSessionStorage } from '@/utils/auth';
+import { ProjectCode } from '@/scripts/ProjectConfig';
+export default {
+    name: 'MessageBoard',
+    data() {
+        return {
+            dialogVisible: false,
+            content: '',
+            postCommentList: [],
+            pageSize: 10,
+            pageNum: 0,
+            total: 0,
+            imgShow: false,
+            lickIcon: lick_icon,
+            unlikeIcon: unlike_icon,
+            replyIcon: reply_icon,
+            deleteIcon: delete_icon,
+            replyMessageId: '',
+            commentContent: '',
+            replyCommentId: '',
+            replyMessageIndex: '',
+            allCommentList: [],
+            moreMessageId: '',
+            replyUserName: '',
+            commentContentNoName: '',
+            postId: ''
+        };
+    },
+    computed: {
+        userId() {
+            return this.$store.state.user.id;
+        },
+        superAdmin() {
+            return this.$store.state.user.roles.includes(superAdmin);
+        },
+        projectCode() {
+            const project = getSessionStorage('project');
+            return ProjectCode[project];
+        }
+    },
+    created() {
+        const that = this;
+        window.handleZoomImg = function () {
+            that.imgShow = true;
+            document.getElementById('targetImg').src = event.target.currentSrc;
+        };
+    },
+    mounted() {
+        if (this.projectCode === 'DRTS' || this.projectCode === 'BJD') {
+            getPostByProjectCode(this.projectCode).then(resp => {
+                this.postId = resp.data.id;
+            });
+        }
+    },
+    methods: {
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        doShow() {
+            this.handleCurrentChange();
+            this.dialogVisible = true;
+        },
+        commitComment() {
+            const images = this.content.match(/<img/g);
+            if (images && images.length > 3) {
+                this.$message.error('留言内容使用图片应小于三张！');
+                return;
+            }
+            if (this.content.length > 1000) {
+                this.$message.error('留言内容超出最大长度！');
+                return;
+            }
+            if (!this.content) {
+                this.$message.error('留言内容不能为空！');
+                return;
+            }
+            answerPost({postId: this.postId, content: this.content}).then(resp => {
+                this.pageNum = 1;
+                this.handleCurrentChange();
+                this.content = '';
+            }).catch(error => {
+                this.$message.error('留言失败 ！');
+                console.log(error);
+            });
+        },
+        handleCurrentChange() {
+            queryMessagePagingByProjectCode(this.projectCode, {pageSize: this.pageSize, pageNum: this.pageNum}).then(resp => {
+                this.postCommentList = [];
+                (resp.data.list || []).forEach(item => {
+                    const value = item.content.replace(/<img/g, '<img style="width: 100px;height: auto;cursor: zoom-in;" onclick="handleZoomImg()"');
+                    item.content = value;
+                    this.postCommentList.push(item);
+                });
+                this.total = resp.data.total;
+            });
+        },
+        goSlide() {
+            const bottom = document.getElementById('boardBottom');
+            const element = document.getElementById('elDialog').childNodes[0];
+            element.scrollTop = bottom.offsetTop;
+            this.$refs.quillEditor.getFocus();
+        },
+        avatarUrl(val) {
+            if (val && val.creatorAvatarPath) {
+                return 'https://joylink.club/oss/joylink' + val.creatorAvatarPath;
+            } else {
+                return 'https://joylink.club/oss/wxmicro_assistant/userhead/defaultuser.png';
+            }
+        },
+
+        handleClear() {
+            this.content = '';
+        },
+        handelCloseImg() {
+            this.imgShow = false;
+            document.getElementById('targetImg').src = '';
+        },
+        replyLeaveMessage(messageId, messageIndex, commentId, userNickname) {
+            this.cancelComment();
+            this.replyMessageId = messageId;
+            this.replyCommentId = commentId;
+            this.replyMessageIndex = messageIndex;
+            if (commentId) {
+                this.replyUserName = '@' + userNickname + ' ';
+                this.commentContent = this.replyUserName + this.commentContentNoName;
+            }
+            this.$nextTick(()=>{
+                document.getElementById('answerInput' + messageId).focus();
+            });
+        },
+        cancelComment() {
+            this.replyMessageId = '';
+            this.commentContent = '';
+            this.replyCommentId = '';
+            this.replyMessageIndex = '';
+            this.replyUserName = '';
+            this.commentContentNoName = '';
+        },
+        commentMessage() {
+            if (this.replyCommentId) {
+                commentComents(this.replyMessageId, this.replyCommentId, {content:this.commentContentNoName}).then(resp => {
+                    this.getCommentList(this.replyMessageId, this.replyMessageIndex);
+                    this.cancelComment();
+                }).catch(error => {
+                    this.$message.error('评论留言失败！');
+                    console.error(error);
+                });
+            } else {
+                commentLevelMessage(this.replyMessageId, {content:this.commentContentNoName}).then(resp => {
+                    this.getCommentList(this.replyMessageId, this.replyMessageIndex);
+                    this.cancelComment();
+                }).catch(error => {
+                    this.$message.error('评论留言失败！');
+                    console.error(error);
+                });
+            }
+        },
+        getCommentList(messageId, messageIndex) {
+            queryMessageCommentList(messageId).then(resp => {
+                if (this.moreMessageId == messageId) {
+                    this.allCommentList = resp.data;
+                }
+                if (resp.data.length > 3) {
+                    this.postCommentList[messageIndex].comments.list = resp.data.slice(0, 3);
+                    this.postCommentList[messageIndex].comments.total = resp.data.length;
+                } else {
+                    this.postCommentList[messageIndex].comments.list = resp.data;
+                    this.postCommentList[messageIndex].comments.total = resp.data.length;
+                }
+            }).catch(error => {
+                this.$message.error('更新回复失败！');
+                console.error(error);
+            });
+        },
+        computedCommentName(elem) {
+            if (elem.replyUserNickName) {
+                return `${elem.userNickname} 回复@ ${elem.replyUserNickName}：`;
+            } else {
+                return elem.userNickname + '：';
+            }
+        },
+        deleteMessage(messageId) {
+            if (this.superAdmin) {
+                deleteMessageByAdmin(messageId).then(resp => {
+                    // this.$message.success('删除留言成功！');
+                    this.handleCurrentChange();
+                }).catch(error => {
+                    this.$message.error('删除留言失败！');
+                    console.error(error);
+                });
+            } else {
+                deleteMessageBySelf(messageId).then(resp => {
+                    // this.$message.success('删除留言成功！');
+                    this.handleCurrentChange();
+                }).catch(error => {
+                    this.$message.error('删除留言失败！');
+                    console.error(error);
+                });
+            }
+        },
+        deleteComment(messageId, messageIndex, commentId) {
+            if (this.superAdmin) {
+                deleteCommentByAdmin(commentId).then(resp => {
+                    this.getCommentList(messageId, messageIndex);
+                }).catch(error => {
+                    this.$message.error('删除回复失败！');
+                    console.error(error);
+                });
+            } else {
+                deleteCommentBySelf(commentId).then(resp => {
+                    this.getCommentList(messageId, messageIndex);
+                }).catch(error => {
+                    this.$message.error('删除回复失败！');
+                    console.error(error);
+                });
+            }
+        },
+        viewMoreComment(data) {
+            queryMessageCommentList(data.id).then(resp => {
+                this.allCommentList = resp.data;
+                this.moreMessageId = data.id;
+            }).catch(error => {
+                console.error(error);
+            });
+        },
+        changeCommentContent(val) {
+            if (this.replyUserName && val.startsWith(this.replyUserName)) {
+                this.commentContentNoName = val.slice(this.replyUserName.length);
+            } else if (this.replyUserName) {
+                this.commentContent = this.replyUserName + this.commentContentNoName;
+            } else {
+                this.commentContentNoName = this.commentContent;
+            }
+        }
+    }
+};
+</script>
+
+<style scoped>
+	.dialog-footer{
+		margin: 0 auto;
+		display: flex;
+		justify-content: center;
+	}
+	.head_portrait{
+		width: 50px;
+		height: 50px;
+		border-radius: 25px;
+	}
+	.view_more {
+		cursor: pointer;
+	}
+	.view_more:hover {
+		cursor: pointer;
+		color: #409EFF;
+	}
+	.img-box{
+		width: 100px;
+		height: auto;
+	}
+	/deep/ .el-dialog.is-fullscreen{
+		background-image:url('../../../../assets/bg_board.jpg');
+	}
+	/deep/.ql-container{
+		height: 80%;
+	}
+	/deep/.el-dialog__title{
+		font-size: 30px;
+		color: #F00;
+		font-family: 'fangsong';
+		font-weight: bolder;
+	}
+</style>
diff --git a/src/views/newMap/displayNew/demon/runPlanView.vue b/src/views/newMap/displayNew/demon/runPlanView.vue
index d0c46c89f..a3aebd600 100644
--- a/src/views/newMap/displayNew/demon/runPlanView.vue
+++ b/src/views/newMap/displayNew/demon/runPlanView.vue
@@ -201,7 +201,7 @@ export default {
         },
         async analyticalServiceNumber(data) {
             this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
                 .map(serviceNumber => { return { serviceNumber }; });
         },
         async analyticalTripNumber(data) {
@@ -245,6 +245,22 @@ export default {
                 this.runPlanData, this.runSeries, { color: '#FF00DE', width: 2 }
             );
             const series = [...this.staticSeries, ...this.runSeries, ... this.selectSeries];
+            // let index = 0;
+            // this.stations.forEach((station, ii) => {
+            //     if (station.visible) {
+            //         index++;
+            //         series.push({
+            //             type: 'bar',
+            //             barGap: '-100%',
+            //             yAxisIndex: index,
+            //             barWidth: '3000%',
+            //             itemStyle: {
+            //                 color: 'red'
+            //             },
+            //             data: [[29030, 50], [29060, 60], [29090, 20], [29120, 60], [29150, 80], [29180, 160], [29210, 50], [29240, 80], [29270, 30]]
+            //         });
+            //     }
+            // });
             this.myChart && this.myChart.setOption({series: series});
         },
         async loadChartPage() {
@@ -268,20 +284,6 @@ export default {
         async loadInitData() {
             this.myChart && this.myChart.showLoading();
             const option = {
-                title: {
-                    text: '',
-                    left: 'center'
-                },
-                grid: {
-                    top: '30px',
-                    left: '120px',
-                    right: '40px',
-                    bottom: '65px',
-                    containLabel: true,
-                    backgroundColor: 'floralwhite'
-                },
-                toolbox: {
-                },
                 tooltip: {
                     axisPointer: {
                         trigger: 'item',
@@ -290,10 +292,14 @@ export default {
                     formatter: this.axisTooltip,
                     borderWidth: 1
                 },
+                grid: {
+                    right: '40px',
+                    left: '120px',
+                    height: '85%'
+                },
                 xAxis: [
                     {
                         type: 'category',
-                        boundaryGap: false,
                         data: [],
                         axisLine: {
                             onZero: false,
@@ -318,54 +324,55 @@ export default {
                         }
                     }
                 ],
-                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: [
+                yAxis: [
                     {
-                        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
+                        type: 'value',
+                        yAxisIndex: 0,
+                        splitLine: {
+                            show: false
                         },
-                        bottom: '20px'
+                        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'
+                            }
+                        }
                     }
+                ],
+                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'
+                }],
+                series: [
+
                 ]
             };
             await this.xAxisInit(option);
@@ -394,6 +401,23 @@ export default {
                     option.dataZoom[0].startValue = option.dataZoom[1].startValue = startValue - offsetTime;
                     option.dataZoom[0].endValue = option.dataZoom[1].endValue = startValue + offsetTime;
                     option.series = [...this.staticSeries, ...this.runSeries, ...this.selectSeries];
+                    // let index = 0;
+                    // this.stations.forEach((station, ii) => {
+                    //     if (station.visible) {
+                    //         index++;
+                    //         option.series.push({
+                    //             type: 'bar',
+                    //             barGap: '-100%',
+                    //             yAxisIndex: index,
+                    //             barWidth: '3000%',
+                    //             itemStyle: {
+                    //                 color: 'red'
+                    //             },
+                    //             data: [[29030, 50], [29060, 60], [29090, 20], [29120, 60], [29150, 80], [29180, 160], [29210, 50], [29240, 80], [29270, 30]]
+                    //         });
+                    //     }
+                    // });
+
                     this.myChart = echarts.init(document.getElementById(this.runPlanId));
                     if (this.myChart) {
                         this.myChart.setOption(option);
@@ -440,8 +464,20 @@ export default {
         },
         yAxisInit(option) {
             if (Object.keys(this.PlanConvert).length) {
-                option.yAxis.min = this.PlanConvert.computedYaxisMinValue(this.stations);
-                option.yAxis.max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+                option.yAxis[0].min = this.PlanConvert.computedYaxisMinValue(this.stations);
+                option.yAxis[0].max = this.PlanConvert.computedYaxisMaxValue(this.stations);
+                let index = 1;
+                this.stations.forEach((station, ii) => {
+                    if (station.visible) {
+                        option.yAxis.push({
+                            type: 'value',
+                            min: option.yAxis[0].min - Math.floor(station.kmRange * this.PlanConvert.CoordMultiple + this.PlanConvert.EdgeHeight),
+                            max: Math.floor(option.yAxis[0].max - station.kmRange * this.PlanConvert.CoordMultiple) - this.PlanConvert.EdgeHeight,
+                            show: false,
+                            yAxisIndex : index++
+                        });
+                    }
+                });
             }
         },
         axisTooltip(param) {
diff --git a/src/views/newMap/displayNew/demonMenu.vue b/src/views/newMap/displayNew/demonMenu.vue
index f4bf216c4..d35237ef8 100644
--- a/src/views/newMap/displayNew/demonMenu.vue
+++ b/src/views/newMap/displayNew/demonMenu.vue
@@ -4,12 +4,20 @@
       <div class="btn_hover" @click="menuClick">菜单</div>
       <el-button-group ref="button_group_box" class="button_group_box" :style="`margin-left:-${btnWidth}px`">
         <!-- 地图错误判断 -->
+        <template v-if="project === 'bjd'">
+          <el-button v-if="running" size="small" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
+          <el-button v-if="!running" size="small" type="warning" @click="loadRunPlan">{{ $t('joinTraining.runGraphLoading') }}</el-button><!-- 运行图加载 -->
+        </template>
         <!-- 设备视图 -->
-        <el-button v-if="jl3dmodelShow && !isContest" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
+        <el-button v-if="jl3dmodelShow && !isContest && project !== 'bjd'" size="small" @click="jumpjlmap3dmodel">{{ jl3dmodel }}</el-button>
         <!-- 三维视图/数字沙盘 -->
-        <el-button v-if="jl3dnameShow && !isContest" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
+        <el-button v-if="jl3dnameShow && !isContest && project !== 'bjd'" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <!-- cctv视图 -->
-        <el-button v-if="cctvShow && !isContest" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+        <el-button v-if="cctvShow && !isContest && project !== 'bjd'" size="small" @click="jumpjl3dpassflow">{{ jl3dpassflow }}</el-button>
+        <!-- 客流规划视图 -->
+        <el-button v-if="trafficplanShow && !isContest" size="small" @click="jumpjl3dtrafficplan">{{ jl3dtrafficplan }}</el-button>
+        <el-button v-if="trafficplanShow && !isContest" size="small" @click="jumpjl3dtraffictrain">{{ $t('display.demon.traffictraintext') }}</el-button>
+
         <!-- 故障设备视图 -->
         <el-button v-if="jlmap3dFaultShow" size="small" @click="jumpjlmap3dFault">故障设备</el-button>
         <!-- 司机视角 -->
@@ -21,7 +29,9 @@
         <!-- <el-button v-if="isContest" size="small" @click=" fieldTeach">实操教学</el-button> -->
         <!-- <el-button v-if="isContest" size="small" @click=" fieldExam">实操测验</el-button> -->
         <el-button v-if="isContest" size="small" @click="goTheoryQuiz">理论考试</el-button>
-        <el-button v-if="isContest" size="small" @click="viewChangeMap">切换地图</el-button>
+        <el-button v-if="project === 'bjd'" size="small" @click="distribute">权限分发</el-button>
+        <el-button v-if="isContest || project === 'bjd'" size="small" @click="messageBoardShow">留言板</el-button>
+        <el-button v-if="isContest || project === 'bjd'" size="small" @click="contectUs">联系方式</el-button>
       </el-button-group>
     </div>
     <Jl3d-Device
@@ -30,21 +40,27 @@
       :panel-show="deviceShow"
       @closedevice3dview="jumpjlmap3dmodel"
     />
+    <distribute-draft ref="distribute" @QrCodeShow="QrCodeShow" />
     <Jl3d-Drive v-show="drivingShow" ref="Jl3dDrive" :panel-show="drivingShow" @showdriving="showdriving" />
     <scheduling v-if="scheduleLoadShow" ref="scheduling" :group="group" />
     <scheduling-view v-if="schedulePreviewShow" ref="schedulingView" :group="group" />
-    <change-map v-if="isContest" ref="changeMap" @changeMap="changeMap" />
+    <qr-code ref="qrCode" />
+    <message-board ref="messageBoard" />
+    <contect-us ref="contectUs" />
   </div>
 </template>
 <script>
 import Jl3dDevice from '@/views/jlmap3d/device/jl3ddevice';
 import Jl3dDrive from '@/views/jlmap3d/drive/jl3ddrive';
 import { getToken } from '@/utils/auth';
-import ChangeMap from './dispatherContest/changeMap';
 import { getSessionStorage } from '@/utils/auth';
 import Scheduling from '@/views/newMap/displayNew/demon/scheduling';
 import SchedulingView from '@/views/newMap/displayNew/demon/schedulingView';
 import { EventBus } from '@/scripts/event-bus';
+import DistributeDraft from '@/views/components/limits/distribute';
+import QrCode from '@/components/QrCode';
+import MessageBoard from './demon/messageBoard';
+import ContectUs from '@/views/newMap/displayNew/dispatherContest/contectUs';
 export default {
     name:'DemonMenu',
     components:{
@@ -52,7 +68,10 @@ export default {
         Jl3dDrive,
         Scheduling,
         SchedulingView,
-        ChangeMap
+        DistributeDraft,
+        QrCode,
+        ContectUs,
+        MessageBoard
     },
     props:{
         isAllShow:{
@@ -71,6 +90,14 @@ export default {
             type:Boolean,
             require:true
         },
+        trafficplanShow:{
+            type:Boolean,
+            require:true
+        },
+        traffictrainShow:{
+            type:Boolean,
+            require:true
+        },
         scheduleLoadShow:{
             type:Boolean,
             require:true
@@ -104,6 +131,8 @@ export default {
             practiceDisabled:false,
             deviceShow: false,
             drivingShow: false,
+            jl3dtrafficplan:this.$t('display.demon.trafficplantext'),
+            jl3dtraffictrain:this.$t('display.demon.traffictraintext'),
             jl3dpassflow:this.$t('display.demon.passengerflow'),
             jl3dname: this.$t('display.demon.threeDimensionalView'),
             jl3dmodel: this.$t('display.demon.deviceView')
@@ -118,6 +147,9 @@ export default {
         },
         isContest() {
             return this.$route.params.mode === 'demon' && this.project == 'drts';
+        },
+        running() {
+            return this.$store.state.training.started;
         }
     },
     mounted() {
@@ -178,6 +210,32 @@ export default {
             });
             window.open(routeData.href, '_blank', 'noopener noreferrer');
         },
+        jumpjl3dtrafficplan() {
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/trafficplan',
+                query:{
+                    mapid:this.mapId,
+                    group:this.group,
+                    project: this.project,
+                    noPreLogout: true,
+                    lineCode:this.lineCode
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
+        jumpjl3dtraffictrain() {
+            const routeData = this.$router.resolve({
+                path:'/jlmap3d/traffictrain',
+                query:{
+                    mapid:this.mapId,
+                    group:this.group,
+                    project: this.project,
+                    noPreLogout: true,
+                    lineCode:this.lineCode
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
         jumpjlmap3dFault() {
             const routeData = this.$router.resolve({
                 path:'/jlmap3d/maintainer',
@@ -209,24 +267,44 @@ export default {
                 this.$refs.schedulingView && this.$refs.schedulingView.doClose();
             }
         },
-        viewChangeMap() {
-            this.$refs.changeMap.doShow();
-        },
-        changeMap(query) {
-            this.$emit('changeMap', query);
-        },
         fieldPractice() {
             this.$emit('fieldPractice');
-            // 'practice'
         },
-        // fieldTeach() {
-        //     this.$emit('fieldPractice', 'teach');
-        // },
-        // fieldExam() {
-        //     this.$emit('fieldPractice', 'exam');
-        // },
+        viewRunPlan() {
+            const routeData = this.$router.resolve({
+                path:'/planSchedule/window',
+                query:{
+                    mapId:this.$route.query.mapId,
+                    group:this.$route.query.group,
+                    lineCode: this.$route.query.lineCode,
+                    project: this.$route.query.project,
+                    noPreLogout: true,
+                    initTime: this.$store.state.training.initTime
+                }
+            });
+            window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
+        loadRunPlan() {
+            this.$emit('runPlanLoadShow');
+        },
         goTheoryQuiz() {
             this.$emit('goTheoryQuiz');
+        },
+        QrCodeShow(data) {
+            if (this.$refs && data) {
+                this.$refs.qrCode.doShow(data);
+            }
+        },
+        distribute() {
+            if (this.$refs) {
+                this.$refs.distribute.doShow({PermissionType:'03', mapId: this.$route.query.mapId, prdType: this.$route.query.prdType});
+            }
+        },
+        messageBoardShow() {
+            this.$refs.messageBoard.doShow();
+        },
+        contectUs() {
+            this.$refs.contectUs.doShow();
         }
     }
 };
diff --git a/src/views/newMap/displayNew/dispatherContest/changeMap.vue b/src/views/newMap/displayNew/dispatherContest/changeMap.vue
deleted file mode 100644
index 26e3d0d86..000000000
--- a/src/views/newMap/displayNew/dispatherContest/changeMap.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag title="切换地图" :visible.sync="dialogVisible" width="20%" center>
-    <el-select v-model="selectMapId" placeholder="请选择地图" style="width: 60%; position: relative; left: 20%;" @change="changeMap">
-      <el-option
-        v-for="item in projectMapList"
-        :key="item.id"
-        :label="item.name"
-        :value="item.id"
-      />
-    </el-select>
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="confirm">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-import { getMapListByProjectCode } from '@/api/jmap/map';
-export default {
-    name:'ChangeMap',
-    data() {
-        return {
-            projectMapList:[],
-            dialogVisible: false,
-            selectMapId:'',
-            selectMapLineCode:''
-        };
-    },
-    mounted() {
-        const projectCode = 'DRTS';
-        getMapListByProjectCode(projectCode).then(res =>{
-            if (res.code === 200) {
-                const projectMapList = res.data;
-                projectMapList.forEach(element => {
-                    this.projectMapList.push({id:element.id, lineCode:element.lineCode, name:element.name});
-                });
-                this.selectMapId = this.$route.query.mapId;
-                this.selectMapLineCode = this.$route.query.lineCode;
-            }
-        }).catch(error => { this.$message.error(error.msg); });
-    },
-    methods:{
-        doShow(row) {
-            this.dialogVisible = true;
-        },
-        confirm() {
-            this.dialogVisible = false;
-            const query = Object.assign({}, this.$route.query);
-            query.lineCode = this.selectMapLineCode;
-            query.mapId = this.selectMapId;
-            this.$emit('changeMap', query);
-        },
-        changeMap(mapId) {
-            const map = this.projectMapList.find(map=>{ return map.id == mapId; });
-            if (map) {
-                this.selectMapId = map.id;
-                this.selectMapLineCode = map.lineCode;
-            }
-        }
-    }
-};
-</script>
diff --git a/src/views/newMap/displayNew/dispatherContest/contectUs.vue b/src/views/newMap/displayNew/dispatherContest/contectUs.vue
new file mode 100644
index 000000000..087ed7e69
--- /dev/null
+++ b/src/views/newMap/displayNew/dispatherContest/contectUs.vue
@@ -0,0 +1,45 @@
+<template>
+  <el-dialog
+    title="联系方式"
+    :visible.sync="dialogVisible"
+    width="400px"
+    :before-close="handleClose"
+  >
+    <div><span class="el-icon-user" style="font-size:15px;margin-right:8px;" />联系人：小九</div>
+    <div class="eachInfo"><span class="el-icon-mobile-phone" style="font-size:15px;margin-right:7px;" />手&nbsp;&nbsp;&nbsp;&nbsp;机：13289398171</div>
+    <div class="eachInfo"><span class="el-icon-message" style="font-size:15px;margin-right:7px;" />邮&nbsp;&nbsp;&nbsp;&nbsp;箱：ServiceEmail@joylink.club</div>
+    <div class="eachInfo">
+      <span class="el-icon-chat-round" style="font-size:15px;margin-right:3px;vertical-align:top;" />
+      <span style="vertical-align: top;">微&nbsp;&nbsp;&nbsp;&nbsp;信：</span>
+      <img :src="wchatImg" width="80" height="80">
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import wchat from '@/assets/wchat.png';
+export default {
+    name:'',
+    data() {
+        return {
+            dialogVisible:false,
+            wchatImg: wchat
+        };
+    },
+    methods:{
+        handleClose() {
+            this.dialogVisible = false;
+        },
+        doShow() {
+            this.dialogVisible = true;
+        }
+    }
+};
+</script>
+<style lang="scss" scoped>
+.eachInfo{
+    margin-top: 10px;
+}
+</style>
diff --git a/src/views/newMap/displayNew/dispatherContest/index.vue b/src/views/newMap/displayNew/dispatherContest/index.vue
index a4d27e0a8..43184651e 100644
--- a/src/views/newMap/displayNew/dispatherContest/index.vue
+++ b/src/views/newMap/displayNew/dispatherContest/index.vue
@@ -12,7 +12,6 @@
       :jlmap3d-fault-show="false"
       :driver-show="isDrive"
       :all-style="'top:'+(offset+textStatusHeight)+'px'"
-      @changeMap="changeMap"
       @fieldPractice="fieldPractice"
       @goTheoryQuiz="goTheoryQuiz"
     />
@@ -24,8 +23,6 @@
           <el-radio-button :label="scriptModeList.PRACTICE" :disabled="isScriptRun">{{ $t('display.lesson.practiceMode') }}</el-radio-button>
           <el-radio-button :label="scriptModeList.TEST" :disabled="isScriptRun">{{ $t('display.lesson.testMode') }}</el-radio-button>
         </el-radio-group>
-        <!-- <span class="display-time">{{ formatUsedTime }}</span> -->
-        <!-- <span v-if="scriptMode === scriptModeList.TEST" class="display-score">{{ $t('display.lesson.score') }}{{ formatScore }}</span> -->
       </el-row>
     </div>
 
@@ -37,9 +34,12 @@
             <el-button type="danger" size="small" @click="handleQuitQuest">退出场景</el-button>
             <el-button type="success" size="small" :disabled="!isScriptRun" @click="endTraining">结束</el-button>
             <el-button type="primary" size="small" :disabled="isScriptRun" @click="startTraining">开始</el-button>
+            <el-button type="" size="small" @click="handleExplain">说明</el-button>
           </template>
           <template v-else>
+            <!-- 初始化 -->
             <el-button type="danger" size="small" @click="end">{{ $t('display.demon.initialize') }}</el-button>
+            <!-- 按计划行车 -->
             <el-button type="success" :disabled="isDisable" size="small" @click="selectBeginTime">{{ $t('display.demon.drivingByPlan') }}</el-button>
           </template>
         </template>
@@ -64,8 +64,6 @@
     <scene-list ref="sceneList" @selectScript="selectScript" />
     <theory-exam-select ref="theoryExamSelect" @startTheoryExam="startTheoryExam" />
     <theory-exam ref="theoryExam" />
-    <!-- <theory-quiz ref="theoryQuiz" @commitResult="commitResult" />
-    <throry-result ref="theoryResult" @restart="goTheoryQuiz" /> -->
     <select-role ref="selectRole" :member-list="currentPlayList" @selectRole="selectRole" />
 
     <operational-statistic ref="operationalStatistic" @finishTraining="finishTraining" />
@@ -85,10 +83,8 @@ import SceneList from './sceneList';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import TheoryExamSelect from './theoryExamSelect';
 import TheoryExam from './theoryExam';
-// import TheoryQuiz from './quiz';
-// import ThroryResult from './result';
 // import { getGoodsTryUse } from '@/api/management/goods';
-import { ranAsPlan, exitRunPlan, clearSimulation, getSimulationInfoNew } from '@/api/simulation';
+import {clearSimulation, getSimulationInfoNew } from '@/api/simulation';
 // import { PermissionType } from '@/scripts/ConstDic';
 // import { getCountTime } from '@/utils/index';
 import { prefixIntrger } from '@/utils/date';
@@ -97,12 +93,11 @@ import SelectRole from '@/views/newMap/displayNew/scriptDisplay/component/select
 // import { setGoodsTryUse } from '@/api/management/goods';
 
 import {competitionPracticalSceneStart, competitionPracticalSceneExit, competitionPracticalSceneFinish, getEmptyOperationalStatistics} from '@/api/competition';
-import { launchFullscreen } from '@/utils/screen';
 import { EventBus } from '@/scripts/event-bus';
-import { createSimulationNew } from '@/api/simulation';
 import OperationalStatistic from './operationalStatistic.vue';
 import TestResult from './testResult.vue';
 import Vue from 'vue';
+import ConstConfig from '@/scripts/ConstConfig';
 
 export default {
     name: 'MenuDemon',
@@ -116,8 +111,6 @@ export default {
         TheoryExam,
         OperationalStatistic,
         TestResult,
-        // TheoryQuiz,
-        // ThroryResult,
         SelectRole
     },
     props: {
@@ -144,14 +137,7 @@ export default {
     },
     data() {
         return {
-            // tryTime: 0, 				// 进入页面多少秒
-            // timeNow: 0, 				// 进入页面 相对时间
-            // time: null, 				// 定时器
-            // countTime: 0, 				// 显示 倒计时
-            // remainingTime: 0,
             userRole: 'AUDIENCE',
-            // goodsId: this.$route.query.goodsId,
-            // try: this.$route.query.try, // 是否是试用权限
             // training: {
             //     id: '',
             //     name: '',
@@ -163,13 +149,6 @@ export default {
             mapLocation: {},
             playerList: [],
             currentPlayList: [],
-            // formatUsedTime:'',
-            // formatScore: 0,
-            // jl3dpassflow: this.$t('display.demon.passengerflow'),
-            // jl3dname: this.$t('display.demon.threeDimensionalView'),
-            // jl3dstation: this.$t('display.demon.threeDimensionalStation'),
-            // jl3dmodel: this.$t('display.demon.deviceView'),
-            // isShow3dmodel: false,
             isGoback: false,
             runing: false,
             prdTypeMap: {
@@ -257,10 +236,6 @@ export default {
         }
     },
     beforeDestroy() {
-        // if (this.time) {
-        //     this.setTryTime();
-        //     clearTimeout(this.time);
-        // }
         this.$store.dispatch('scriptRecord/updateSimulationPause', false);
         this.$store.dispatch('map/resetActiveTrainList', true);
     },
@@ -272,116 +247,24 @@ export default {
         });
     },
     methods: {
-        // async initLoadPage() {
-        //     try {
-        //         if (this.try != '0') {
-        //             this.loadInitData();
-        //         }
-        //     } catch (error) {
-        //         console.log(error);
-        //     }
-        // },
         formatTime(initTime) {
             const hh = prefixIntrger(initTime.getHours(), 2);
             const mm = prefixIntrger(initTime.getMinutes(), 2);
             const ss = prefixIntrger(initTime.getSeconds(), 2);
             return `${hh}:${mm}:${ss}`;
         },
-        // loadInitData() {
-        //     const data = {
-        //         mapId: this.$route.query.mapId,
-        //         prdType: this.$route.query.prdType,
-        //         permissionType: PermissionType.SIMULATION
-        //     };
-        //     getGoodsTryUse(data).then(res => {
-        //         this.remainingTime = res.data.tryTime;
-        //         this.timeNow = Date.parse(new Date()) / 1000 + this.remainingTime;
-        //         if (this.try) {
-        //             this.time = setInterval(() => {
-        //                 this.tryTime += 1;
-        //                 this.countTime = getCountTime(this.timeNow);
-        //                 if (this.countTime == -1) {
-        //                     this.back();
-        //                 }
-        //             }, 1000);
-        //         }
-        //     }).catch(() => {
-        //         this.$messageBox(this.$t('display.demon.getTimeFail'));
-        //     });
-        // },
         selectBeginTime() {
             this.$refs.setTime.doShow();
         },
-        changeMap(query) {
-            clearSimulation(this.group).then(res=>{
-                const data = { mapId: query.mapId, prdType: query.prdType };
-                createSimulationNew(data).then(resp => {
-                    this.$store.dispatch('training/over');
-                    this.$store.dispatch('training/reset');
-                    this.$store.dispatch('map/mapClear');
-                    this.$store.dispatch('training/setPrdType', this.currentPrdType); // 改变prdType
-                    query.group = resp.data;
-                    const newQuery = Object.assign({}, query);
-                    newQuery.noFirst = true;
-                    this.$router.replace({query: newQuery});
-                    launchFullscreen();
-                }).catch(error => {
-                    this.$messageBox(this.$t('error.createSimulationFailed') + error.message);
-                    this.disabled = false;
-                });
-            });
-        },
         start(model) { // 开始仿真
-            const data = {
-                time: model.initTime
-            };
-            if (this.$route.query.prdType === '04') {
-                data.loadNumber = model.loadNum;
-            }
-            ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
-            }).catch(error => {
-                if (error.code == '5001') {
-                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5002') {
-                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5003') {
-                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5004') {
-                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5000') {
-                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4000') {
-                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4001') {
-                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4002') {
-                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4003') {
-                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4004') {
-                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
-                } else {
-                    this.$messageBox('按计划行车异常,请退出重试!');
-                }
-            });
+            this.$emit('start', model);
         },
         setRuning(run) {
             this.runing = run;
             this.$refs.demonMenu.hideScheduling(run);
         },
         end() {
-            exitRunPlan(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/resetActiveTrainList', false);
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
+            this.$emit('end');
         },
         handleQuitQuest() {
             competitionPracticalSceneExit(this.group).then(resp => {
@@ -458,6 +341,15 @@ export default {
             (this.$store.state.training.memberData[role.id] || {}).disabled = true;
             this.runScriptMode(memberId);
         },
+        handleExplain() {
+            let name = this.$store.state.training.notifySelected.title;
+            if (name.includes('—')) {
+                name = name.split('—')[0];
+            }
+            const ossData = ConstConfig.ConstSelect.ossList.find(ele => { return ele.name == name; });
+            const href = `https://joylink.club/oss/cbtc/race/${ossData.url}`;
+            window.open(href, '_blank');
+        },
         finishTraining(data) {
             this.isScriptRun = false;
             this.showResultData(data);
@@ -469,11 +361,8 @@ export default {
             competitionPracticalSceneFinish(this.group, {operationStatisticVO:{}}).then(res=>{
                 this.isScriptRun = false;
                 // if (this.scriptMode == ScriptMode.TEST) {
-                // this.formatScore = res.data;
-                // this.
                 this.showResultData(res.data);
                 // this.$store.dispatch('scriptRecord/updateAudioPlay', false);
-                // this.$messageBox('得分：' + this.formatScore);
                 // }
                 // this.userRole = 'AUDIENCE';
                 // this.$store.dispatch('training/setRoles', 'AUDIENCE');
@@ -590,15 +479,6 @@ export default {
                 this.$message.error('结束仿真失败！');
             });
         },
-        // setTryTime() {
-        //     if (this.try) {
-        //         const data = { time: this.tryTime, goodsId: this.goodsId };
-        //         if (data.goodsId) {
-        //             setGoodsTryUse(data);
-        //         }
-
-        //     }
-        // },
         fieldPractice() {
             this.$refs.sceneList.doShow();
         },
@@ -613,9 +493,6 @@ export default {
                 this.$refs.operationalStatistic.doShow(res.data);
             });
         }
-        // commitResult(result) {
-        //     this.$refs.theoryResult.doShow(result);
-        // }
     }
 };
 </script>
diff --git a/src/views/newMap/displayNew/dispatherContest/requestQuestion.vue b/src/views/newMap/displayNew/dispatherContest/requestQuestion.vue
deleted file mode 100644
index 207115cd3..000000000
--- a/src/views/newMap/displayNew/dispatherContest/requestQuestion.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<template>
-  <div class="question">
-    <div class="ql-editor" v-html="appendIndex($escapeHTML(`${option.topic}`), $vnode.key, option)" />
-    <template v-if="checkType(option, 'judge')">
-      <el-radio-group v-model="answer" disabled :class="{'select-box': option.rightAnswer != option.answer}" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: inline">
-          <span>{{ el.content }}</span>
-        </el-radio>
-      </el-radio-group>
-    </template>
-    <template v-else-if="checkType(option, 'select')">
-      <el-radio-group v-model="answer" disabled :class="{'select-box': option.rightAnswer != option.answer}" @change="onChnage">
-        <el-radio v-for="(el,i) in option.optionList" :key="i" :label="$str2number(el.id)" style="display: block">
-          <span>{{ $asc2chart(i+65) }}. </span>
-          <div class="ql-editor" style="display: inline; padding: 0" v-html="$escapeHTML(el.content)" />
-        </el-radio>
-      </el-radio-group>
-    </template>
-  </div>
-</template>
-
-<script>
-
-export default {
-    props: {
-        value: {
-            type: String,
-            default: ''
-        },
-        option: {
-            type: Object,
-            required: true
-        }
-    },
-    data() {
-        return {
-            answer: 0
-        };
-    },
-    watch: {
-        value(val) {
-            this.changeValue();
-        }
-    },
-    mounted() {
-        this.changeValue();
-    },
-    methods: {
-        changeValue() {
-            this.answer = parseInt(this.value);
-        },
-        checkType(option, type) {
-            return option.type == type;
-        },
-        appendIndex(str, index, option) {
-            let result = '';
-            const i = option.optionList.findIndex(ele => ele.correct);
-            if (option.type === 'select') {
-                if (option.answer == option.optionList[i].id) {
-                    result = `<span style="color: green;margin-left: 10px;">(正确 得分: ${option.score})</span>`;
-                } else {
-                    result = `<span style="color: red;margin-left: 10px;">(错误 正确答案: ${this.$asc2chart(i + 65)})</span>`;
-                }
-            } else if (option.type === 'judge') {
-                if (option.answer == option.optionList[i].id) {
-                    result = `<span style="color: green;margin-left: 10px;">(正确 得分: ${option.score})</span>`;
-                } else {
-                    result = `<span style="color: red;margin-left: 10px;">(错误 正确答案: ${option.optionList[i].content})</span>`;
-                }
-            }
-            this.$set(option, 'rightAnswer', option.optionList[i].id);
-            // 判断是否选择正确 来显示不同内容
-            return `${index + 1}. ${str} ${result}`;
-        },
-        onChnage(e) {
-            const answer = `${e}`;
-            this.$emit('input', answer);
-            this.$emit('save', {userExamQuestionId: this.option.id, answer: answer});
-        }
-    }
-};
-
-</script>
-<style lang="scss" scoped>
-	.rich-text {
-		padding: 0;
-		display: inline;
-	}
-
-	.question {
-		/deep/ {
-			.ql-editor {
-				line-height: 26px;
-				padding: 0;
-			}
-
-			.el-radio  {
-				color: #000;
-			}
-
-			.el-radio__label {
-				font-size: 16px;
-				line-height: 26px;
-			}
-
-			.el-radio-group .is-disabled .el-radio__label{
-				color: #333;
-			}
-
-			.select-box.el-radio-group .is-checked.is-disabled .el-radio__label{
-				color: red;
-			}
-
-        }
-	}
-</style>
diff --git a/src/views/newMap/displayNew/dispatherContest/sceneList.vue b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
index 70399a75a..cf7ca1a24 100644
--- a/src/views/newMap/displayNew/dispatherContest/sceneList.vue
+++ b/src/views/newMap/displayNew/dispatherContest/sceneList.vue
@@ -1,26 +1,34 @@
 <template>
   <div>
-    <el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="900px" center>
-      <el-tabs v-model="activeName" type="card" style="height: 500px;">
+    <el-dialog v-dialogDrag title="场景列表" :visible.sync="dialogVisible" width="920px" center>
+      <el-tabs v-model="activeName" type="card" style="height:650px">
+        <!-- style="height: 500px;" -->
         <el-tab-pane label="主场景列表" name="first">
-          <el-table :data="mainSceneData" border :span-method="objectSpanMethod" stripe :cell-style="{padding: '8px 0'}">
+          <el-table :data="mainSceneData" border :span-method="objectSpanMethod" height="600" stripe :cell-style="{padding: '8px 0'}">
             <el-table-column type="index" width="50" label="序号" />
             <el-table-column prop="type" width="200" label="类别" />
             <el-table-column prop="scene" width="350" label="场景" />
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <div v-if="scope.row.result">
-                  <template v-for="(each,index) in scope.row.result">
-                    <el-tooltip :key="index" class="item" effect="dark" :content="'场景描述： '+ each.description + '\n' + '处置流程： ' +each.disposalProcesses" popper-class="tooltip-box" placement="top">
-                      <el-button type="primary" size="small" @click="handleLoad(each)">{{ each.name }}</el-button>
-                    </el-tooltip>
+                  <template v-for="(each, index) in scope.row.result">
+                    <el-button :key="index" type="primary" size="small" style="margin-right: 8px;margin-left: 0;margin-bottom: 5px" @click="handleLoad(each)">{{ each.name }}</el-button>
                   </template>
                 </div>
               </template>
             </el-table-column>
+            <!-- <el-table-column label="说明" width="240">
+              <template slot-scope="scope">
+                <div v-if="scope.row.result">
+                  <template v-for="(each,index) in scope.row.result">
+                    <el-button :key="index" type="primary" size="small" @click="handleExplain(each)">{{ each.name }}</el-button>
+                  </template>
+                </div>
+              </template>
+            </el-table-column> -->
           </el-table>
         </el-tab-pane>
-        <el-tab-pane label="副场景列表" name="second">
+        <!-- <el-tab-pane label="副场景列表" name="second">
           <el-table :data="deputySceneData" border stripe>
             <el-table-column type="index" width="50" label="序号" />
             <el-table-column prop="scene" width="550" label="场景" />
@@ -30,7 +38,7 @@
               </template>
             </el-table-column>
           </el-table>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </el-dialog>
   </div>
@@ -40,6 +48,7 @@
 import { getDraftScriptByGroupNew } from '@/api/script';
 import {loadCompetitionPracticalScene, getCompetitionPracticalScene} from '@/api/competition';
 import { EventBus } from '@/scripts/event-bus';
+import ConstConfig from '@/scripts/ConstConfig';
 
 export default {
     name:'ChangeMap',
@@ -66,16 +75,18 @@ export default {
                 {type: '车站机电设备故障', scene: '站台门故障', result:[]},
                 // {type: '车站机电设备故障', scene: '车站照明故障', result:[]},
                 {type: '限速', scene: '列车限速', result:[]},
-                {type: '轨道故障', scene: '线路故障影响列车运行', result:[]}
-            ],
-            deputySceneData: [
-                { scene: '列车在站停车超时' },
-                { scene: '列车无移动授权(站间区间或车站)' },
-                { scene: '信号机故障(防护、分界点、出站等)' },
-                { scene: '站台门关不上(单个或多个)' },
-                { scene: '客流激增行车处置' },
-                { scene: '路网协调请求(限流、换乘站通过)' }
+                {type: '轨道故障', scene: '线路故障影响列车运行', result:[]},
+                {type: '轨道故障', scene: '计轴故障', result:[]}
+                // {type: '在区域控制器故障', scene: '线路故障多车降级', result:[]}
             ]
+            // deputySceneData: [
+            //     { scene: '列车在站停车超时' },
+            //     { scene: '列车无移动授权(站间区间或车站)' },
+            //     { scene: '信号机故障(防护、分界点、出站等)' },
+            //     { scene: '站台门关不上(单个或多个)' },
+            //     { scene: '客流激增行车处置' },
+            //     { scene: '路网协调请求(限流、换乘站通过)' }
+            // ]
         };
     },
     mounted() {
@@ -91,12 +102,16 @@ export default {
                         this.mainSceneData[0].result.push({id:each.id, name:'场景4', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景5' || each.name == '场景11') {
                         this.mainSceneData[4].result.push({id:each.id, name:each.name, description: each.description, disposalProcesses: each.disposalProcesses});
+                    } else if (each.name == '场景6') {
+                        this.mainSceneData[9].result.push({id:each.id, name:each.name, description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景9') {
                         this.mainSceneData[6].result.push({id:each.id, name:'场景9', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景8') {
                         this.mainSceneData[5].result.push({id:each.id, name:'场景8', description: each.description, disposalProcesses: each.disposalProcesses});
                     } else if (each.name == '场景10') {
                         this.mainSceneData[7].result.push({id:each.id, name:'场景10', description: each.description, disposalProcesses: each.disposalProcesses});
+                    } else if (each.name == '场景12') {
+                        this.mainSceneData[2].result.push({id:each.id, name:'场景12', description: each.description, disposalProcesses: each.disposalProcesses});
                     }
                 });
             }
@@ -137,7 +152,6 @@ export default {
                         message: `
 							<p><span style="color: #000;font-weight: bold;">场景描述：</span>${row.description}</p>`,
                         customClass: 'notify_box',
-                        // position: 'top-left',
                         showClose: false,
                         offset: 75,
                         duration: 0
@@ -215,6 +229,11 @@ export default {
                 }
             }
         },
+        async handleExplain(row) {
+            const ossData = ConstConfig.ConstSelect.ossList.find(ele => { return ele.name == row.name; });
+            const href = `https://joylink.club/oss/cbtc/race/${ossData.url}`;
+            window.open(href, '_blank');
+        },
         confirm(playerList) {
             // this.$store.dispatch('training/setScriptOperationType', this.operationType);
             // operationType:ScriptMode[this.operationType]
@@ -227,12 +246,12 @@ export default {
                     rowspan: 3,
                     colspan: 1
                 };
-            } else if (rowIndex === 4 && columnIndex === 1) {
+            } else if ((rowIndex === 4 || rowIndex === 8) && columnIndex === 1) {
                 return {
                     rowspan: 2,
                     colspan: 1
                 };
-            } else if ((rowIndex === 2 || rowIndex === 3 || rowIndex === 5) && columnIndex === 1) {
+            } else if ((rowIndex === 2 || rowIndex === 3 || rowIndex === 5 || rowIndex === 9) && columnIndex === 1) {
                 return {
                     rowspan: 0,
                     colspan: 0
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 55edd8e88..4a99f50d1 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -4,11 +4,11 @@
       <transition name="el-zoom-in-bottom">
         <map-system-draft ref="mapCanvas" @back="back" />
       </transition>
-      <menu-demon v-if="isDemon" ref="menuDemon" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" />
+      <menu-demon v-if="isDemon" ref="menuDemon" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
       <menu-lesson v-if="isLesson" ref="lessonMenu" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" :tip-bottom="tipBottom" />
       <menu-exam v-if="isExam" ref="menuExam" :offset="offset" :data-error="dataError" :offset-bottom="offsetBottom" />
-      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" />
-      <menu-dispather-contest v-if="isContest" ref="menuDispatherContest" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" />
+      <menu-script v-if="isScript" ref="menuScript" :offset-bottom="offsetBottom" :offset="offset" :text-status-height="textStatusHeight" :data-error="dataError" @start="start" @end="end" />
+      <menu-dispather-contest v-if="isContest" ref="menuDispatherContest" :offset="offset" :offset-bottom="offsetBottom" :data-error="dataError" :text-status-height="textStatusHeight" @start="start" @end="end" />
     </template>
     <menu-train-list v-if="isDemon||isContest||isScript" @setCenter="setCenter" />
     <menu-system-time ref="menuSystemTime" :offset="offset" :group="group" />
@@ -19,7 +19,6 @@ import { getSessionStorage } from '@/utils/auth';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
 import { timeFormat } from '@/utils/date';
-
 import MapSystemDraft from '@/views/newMap/mapsystemNew/index';
 import MenuLesson from './lesson/index';
 import MenuDemon from './menuDemon';
@@ -30,7 +29,7 @@ import MenuDispatherContest from './dispatherContest/index';
 import MenuTrainList from '@/views/newMap/displayNew/menuTrainList';
 import MenuSystemTime from '@/views/newMap/displayNew/menuSystemTime';
 
-import { clearSimulation, getSimulationInfoNew } from '@/api/simulation';
+import { clearSimulation, getSimulationInfoNew, ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { loadNewMapDataByGroup } from '@/utils/loaddata';
 import { EventBus } from '@/scripts/event-bus';
 
@@ -82,6 +81,9 @@ export default {
         isScript() {
             return this.mode === 'script';
         },
+        isPlan() {
+            return this.mode === 'plan';
+        },
         mapId() {
             return this.$route.query.mapId;
         },
@@ -235,6 +237,69 @@ export default {
                 this.$messageBox(`获取地图数据失败: ${error.message}`);
                 this.endViewLoading();
             }
+        },
+        start(model) { // 开始仿真
+            const data = {
+                time: model.initTime
+            };
+            if (this.$route.query.prdType === '04') {
+                data.loadNumber = model.loadNum;
+            }
+            ranAsPlan(data, this.group).then(res => {
+                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
+            }).catch(error => {
+                let message = '';
+                switch (error.code) {
+                case '5001':
+                    message = this.$t('error.mapDataError');
+                    break;
+                case '5002':
+                    message = this.$t('error.runningChartDataError');
+                    break;
+                case '5003':
+                    message = this.$t('error.runningChartIsNotLoaded');
+                    break;
+                case '5004':
+                    message = this.$t('error.runningDataError');
+                    break;
+                case '5000':
+                    message = this.$t('error.systemError');
+                    break;
+                case '4000':
+                    message = this.$t('error.simulationDoesNotExist');
+                    break;
+                case '4001':
+                    message = this.$t('error.simulationOperationIsNotDefined');
+                    break;
+                case '4002':
+                    message = this.$t('error.simulationOperationProcessingMethodNotFound');
+                    break;
+                case '4003':
+                    message = this.$t('error.simulationOperationFailed');
+                    break;
+                case '4004':
+                    message = this.$t('error.operationConflict');
+                    break;
+                default:
+                    message = '按计划行车异常,请退出重试!';
+                    // this.$messageBox('按计划行车异常,请退出重试!');
+                    break;
+                }
+                this.$messageBox(message + '，' + this.$t('error.startSimulationFailed'));
+            });
+        },
+        end() {
+            exitRunPlan(this.group).then(() => {
+                this.$store.dispatch('training/over').then(() => {
+                    this.$store.dispatch('training/setMapDefaultState').then(() => {
+                        this.$store.dispatch('map/clearJlmapTrainView');
+                        this.$store.dispatch('map/resetActiveTrainList', false);
+                        this.$store.dispatch('map/setTrainWindowShow', false);
+                    });
+                });
+            }).catch(() => {
+                this.$messageBox(this.$t('display.demon.endSimulationFail'));
+            });
         }
     }
 };
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 2ec57904e..228cc85fd 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -14,16 +14,18 @@
       :jl3dmodel-show="isShow3dmodel && !isShowScheduling && !isDrive"
       :jl3dname-show="!isShowScheduling&&!isDrive"
       :cctv-show="!isShowScheduling"
+      :trafficplan-show="!isShowScheduling"
       :schedule-load-show="isShowScheduling && !runing"
       :schedule-preview-show="isShowScheduling && runing"
       :jlmap3d-fault-show="false"
       :driver-show="isDrive"
       :all-style="'top:'+(offset+textStatusHeight)+'px'"
+      @runPlanLoadShow="runPlanLoadShow"
     />
 
     <div class="display-draft" :class="{'haerbin_btn_box': $route.query.lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
       <el-button-group class="button-group-box">
-        <el-button type="primary" size="small" @click="back">{{ projectDevice?'退出':$t('display.demon.back') }}</el-button>
+        <el-button type="primary" size="small" @click="back">{{ projectDevice||project==='bjd'?'退出':$t('display.demon.back') }}</el-button>
         <template v-if="!dataError">
           <template v-if="isScriptRun">
             <el-button type="danger" size="small" @click="handleQuitQuest">退出剧本</el-button>
@@ -57,7 +59,7 @@ import DemonChat from './demonChat';
 import { Notification } from 'element-ui';
 import MenuSchema from '@/views/newMap/displayNew/menuSchema';
 import { getGoodsTryUse } from '@/api/management/goods';
-import { ranAsPlan, exitRunPlan, getSimulationInfoNew } from '@/api/simulation';
+import {getSimulationInfoNew } from '@/api/simulation';
 import { PermissionType } from '@/scripts/ConstDic';
 import { getCountTime } from '@/utils/index';
 import { TrainingMode } from '@/scripts/ConstDic';
@@ -66,6 +68,7 @@ import { setGoodsTryUse } from '@/api/management/goods';
 import {loadScriptNew } from '@/api/simulation';
 import StatusIcon from '@/views/components/StatusIcon/statusIcon';
 import Vue from 'vue';
+import { getSessionStorage } from '@/utils/auth';
 import { EventBus } from '@/scripts/event-bus';
 
 export default {
@@ -145,6 +148,9 @@ export default {
         },
         isDisable() {
             return this.$store.state.training.started;
+        },
+        project() {
+            return getSessionStorage('project');
         }
     },
     watch: {
@@ -241,56 +247,14 @@ export default {
             this.$refs.setTime.doShow();
         },
         start(model) { // 开始仿真
-            const data = {
-                time: model.initTime
-            };
-            if (this.$route.query.prdType === '04') {
-                data.loadNumber = model.loadNum;
-            }
-            ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
-            }).catch(error => {
-                if (error.code == '5001') {
-                    this.$messageBox(this.$t('error.mapDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5002') {
-                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5003') {
-                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5004') {
-                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5000') {
-                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4000') {
-                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4001') {
-                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4002') {
-                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4003') {
-                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4004') {
-                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
-                } else {
-                    this.$messageBox('按计划行车异常,请退出重试!');
-                }
-            });
+            this.$emit('start', model);
         },
         setRuning(run) {
             this.runing = run;
             this.$refs.demonMenu.hideScheduling(run);
         },
         end() {
-            exitRunPlan(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/resetActiveTrainList', false);
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
+            this.$emit('end');
         },
         handleQuitQuest() {
             quitScriptNew(this.group).then(resp => {
@@ -399,6 +363,9 @@ export default {
                 }
 
             }
+        },
+        runPlanLoadShow() {
+            this.$refs.menuSchema.loadRunPlan();
         }
     }
 };
diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue
index f4765aad9..0a73e57fe 100644
--- a/src/views/newMap/displayNew/menuSchema.vue
+++ b/src/views/newMap/displayNew/menuSchema.vue
@@ -2,7 +2,7 @@
   <div>
     <div class="schema" :style="{top: offset+'px'}">
       <select-station v-if="isLocalStation && !isScript" ref="selectStation" :style-css="'width: 100px;'" />
-      <template v-if="!dataError">
+      <template v-if="!dataError&& project !== 'bjd'">
         <el-button-group>
           <el-button v-if="isScheduling && isDepot" size="small" type="primary" @click="runPlanEditShow">运行图编辑</el-button>
           <!-- 加载剧本 -->
diff --git a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
index b7f3e3ed0..6894e29d8 100644
--- a/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
+++ b/src/views/newMap/displayNew/scriptDisplay/component/covertOperation.js
@@ -222,10 +222,10 @@ export const operateEnum = {
         Train_Link: {
             isList:true,
             params:[
-                {
-                    code:'groupNumber1',
-                    name:'主动车'
-                },
+                // {
+                //     code:'groupNumber1',
+                //     name:'主动车'
+                // },
                 {
                     code:'groupNumber2',
                     name:'被动车'
diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
index 517625e7b..69c68cd3c 100644
--- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
+++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue
@@ -55,7 +55,6 @@ import DemonMenu from '@/views/newMap/displayNew/demonMenu';
 import TipScriptRecordNew from '@/views/scriptManage/tipScriptRecord';
 import SetTime from '@/views/newMap/displayNew/demon/setTime';
 import { Notification } from 'element-ui';
-import { ranAsPlan, exitRunPlan } from '@/api/simulation';
 import { getSimulationMemberList} from '@/api/simulation';
 import ChatBox from '@/views/newMap/chatView/chatBox.vue';
 
@@ -179,47 +178,10 @@ export default {
             this.$refs.setTime.doShow();
         },
         start(model) {
-            const data = {
-                time: model.initTime
-            };
-            ranAsPlan(data, this.group).then(res => {
-                this.$store.dispatch('training/setInitTime', +new Date(`${new Date().toLocaleDateString()} ${model.initTime}`));
-            }).catch((error) => {
-                if (error.code == '5001') {
-                    this.$messageBox(this.$t('error.mapDataError') + '，' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5002') {
-                    this.$messageBox(this.$t('error.runningChartDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5003') {
-                    this.$messageBox(this.$t('error.runningChartIsNotLoaded') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5004') {
-                    this.$messageBox(this.$t('error.runningDataError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '5000') {
-                    this.$messageBox(this.$t('error.systemError') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4000') {
-                    this.$messageBox(this.$t('error.simulationDoesNotExist') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4001') {
-                    this.$messageBox(this.$t('error.simulationOperationIsNotDefined') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4002') {
-                    this.$messageBox(this.$t('error.simulationOperationProcessingMethodNotFound') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4003') {
-                    this.$messageBox(this.$t('error.simulationOperationFailed') + ',' + this.$t('error.startSimulationFailed'));
-                } else if (error.code == '4004') {
-                    this.$messageBox(this.$t('error.operationConflict') + ',' + this.$t('error.startSimulationFailed'));
-                }
-            });
+            this.$emit('start', model);
         },
         end() {
-            exitRunPlan(this.group).then(() => {
-                this.$store.dispatch('training/over').then(() => {
-                    this.$store.dispatch('training/setMapDefaultState').then(() => {
-                        this.$store.dispatch('map/clearJlmapTrainView');
-                        this.$store.dispatch('map/resetActiveTrainList', false);
-                        this.$store.dispatch('map/setTrainWindowShow', false);
-                    });
-                });
-            }).catch(() => {
-                this.$messageBox(this.$t('display.demon.endSimulationFail'));
-            });
+            this.$emit('end');
         },
         back() {
             history.go(-1);
diff --git a/src/views/newMap/jointTrainingNew/menuDemon.vue b/src/views/newMap/jointTrainingNew/menuDemon.vue
index 42867cdb8..726febd69 100644
--- a/src/views/newMap/jointTrainingNew/menuDemon.vue
+++ b/src/views/newMap/jointTrainingNew/menuDemon.vue
@@ -12,18 +12,17 @@
         <el-button v-if="isShowScheduling || isDriver" size="small" @click="jumpjlmap3d">{{ jl3dname }}</el-button>
         <!-- cctv视图 -->
         <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dpassflow">{{ $t('display.demon.passengerflow') }}</el-button>
-        <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dfaultdevice">{{ $t('display.demon.maintainer') }}</el-button>
+        <!-- 客流规划视图 -->
+        <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dtrafficplan">{{ $t('display.demon.trafficplantext') }}</el-button>
+        <el-button v-if="isShowScheduling || isStationSupervisor" size="small" @click="jumpjl3dtraffictrain">{{ $t('display.demon.traffictraintext') }}</el-button>
+
+        <el-button v-if="(isShowScheduling || isStationSupervisor)&&project !== 'bjd'" size="small" @click="jumpjl3dfaultdevice">{{ $t('display.demon.maintainer') }}</el-button>
         <!-- <el-button v-if="isAdmin" size="small" @click="otherVrView">VR第三人称视角</el-button> -->
-        <el-button v-if="isAdmin && !noQrcodeList.includes(project) && $route.query.type !== 'ILW'" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
-        <el-button v-if="isAdmin && $route.query.type !== 'ILW'" size="small" @click="memberManage">成员管理</el-button>
-        <el-button v-if="(isAdmin && isProject) || $route.query.type === 'ILW'" size="small" @click="handleEquipment">设备管理</el-button>
-        <el-button v-if="isDeviceLogin" size="small" @click="handleTeach">教学系统</el-button>
-        <el-button v-if="isDeviceLogin || $route.query.type === 'IM'" size="small" @click="handleExam">考试系统</el-button>
-        <template v-if="project === 'bjd'">
-          <el-button v-if="running && !dataError" size="small" @click="viewRunPlan">{{ $t('joinTraining.runGraphPreview') }}</el-button>
-          <el-button v-if="!running && !dataError" size="small" type="warning" @click="loadRunPlan">{{ $t('joinTraining.runGraphLoading') }}</el-button><!-- 运行图加载 -->
-          <el-button v-if="isAdmin && !dataError" size="small" :type="faultMode ? '' : 'primary' " @click="changeOperateMode()">{{ faultMode?' 切换到普通模式':'切换到故障模式' }}</el-button>
-        </template>
+        <el-button v-if="qrCodeShow" type="primary" size="small" @click="generateQrCode">生成二维码</el-button>
+        <el-button v-if="memberManageShow" size="small" @click="memberManage">成员管理</el-button>
+        <el-button v-if="deviceManageShow" size="small" @click="handleEquipment">设备管理</el-button>
+        <el-button v-if="teachSystemShow" size="small" @click="handleTeach">教学系统</el-button>
+        <el-button v-if="examSystemShow" size="small" @click="handleExam">考试系统</el-button>
       </el-button-group>
     </div>
     <div class="display-draft" :class="{'display-type-hb': lineCode == '07' && $store.state.training.prdType=='01', 'haerbin_btn_box': lineCode == '07'}" :style="{bottom: offsetBottom + 'px'}">
@@ -60,10 +59,9 @@ import { exitFullscreen } from '@/utils/screen';
 import { getSimulationQrcode } from '@/api/jointSimulation';
 import { getSessionStorage } from '@/utils/auth';
 import { refereeExitSimulation, quitCurrentRace, startPracticalCompetition, submitPracticalCompetition } from '@/api/competition';
-import { NoQrcodeList } from '@/scripts/ProjectConfig';
+import { NoSimulationQrCodeList } from '@/scripts/ProjectConfig';
 import { getPublishLessonListByMapId } from '@/api/jmap/lesson';
 import localStore from 'storejs';
-import { OperateMode } from '@/scripts/ConstDic';
 
 export default {
     name: 'MenuDemonJoint',
@@ -119,12 +117,11 @@ export default {
             chatShow: true,
             jsStart: true,
             isGoback: false,
-            noQrcodeList: NoQrcodeList,
+            noSimulationQrCodeList: NoSimulationQrCodeList,
             isShow3dmodel :false,
             jl3dname: this.$t('display.demon.threeDimensionalView'),
             hoverBtn: false,
-            btnWidth: 0,
-            faultMode: false
+            btnWidth: 0
         };
     },
     computed: {
@@ -155,7 +152,7 @@ export default {
             if ((this.isShow3dmodel && this.isShowScheduling) ||
                 (this.isShowScheduling || this.isDriver) ||
                 (this.isShowScheduling || this.isStationSupervisor) ||
-                (this.isAdmin && !this.noQrcodeList.includes(this.project)) ||
+                (this.isAdmin && !this.noSimulationQrCodeList.includes(this.project)) ||
                 (this.isAdmin) || (this.isAdmin && this.isProject) || this.isDeviceLogin || this.$route.query.type === 'IM') {
                 num++;
             }
@@ -165,10 +162,24 @@ export default {
             const typeList = ['LW', 'CW'];
             return typeList.includes(this.$route.query.type);
         },
-        isDisable() {
-            return this.$store.state.training.started;
+        examSystemShow() {
+            const typeList = ['LW', 'CW', 'IM'];
+            return typeList.includes(this.$route.query.type);
         },
-        running() {
+        teachSystemShow() {
+            const typeList = ['LW', 'CW'];
+            return typeList.includes(this.$route.query.type);
+        },
+        memberManageShow() {
+            return this.isAdmin && this.$route.query.type !== 'ILW';
+        },
+        deviceManageShow() {
+            return (this.isAdmin && this.isProject) || this.$route.query.type === 'ILW';
+        },
+        qrCodeShow() {
+            return this.isAdmin && !this.noSimulationQrCodeList.includes(this.project) && this.$route.query.type !== 'ILW';
+        },
+        isDisable() {
             return this.$store.state.training.started;
         }
     },
@@ -344,7 +355,7 @@ export default {
             this.$store.dispatch('training/over').then(() => {
                 this.backLoading = true;
                 this.$store.dispatch('map/resetActiveTrainList', true);
-                if (this.$route.query.projectDevice || this.$route.query.project === 'bjd') {
+                if (this.$route.query.projectDevice) {
                     this.$store.dispatch('LogOut').then(() => {
                         location.reload();
                     });
@@ -363,6 +374,32 @@ export default {
         jumpjl3dpassflow() {
             this.$emit('passflow');
         },
+        jumpjl3dtrafficplan() {
+          const routeData = this.$router.resolve({
+              path:'/jlmap3d/trafficplan',
+              query:{
+                  mapid:this.mapId,
+                  group:this.group,
+                  project: this.project,
+                  noPreLogout: true,
+                  lineCode:this.lineCode
+              }
+          });
+          window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
+        jumpjl3dtraffictrain() {
+          const routeData = this.$router.resolve({
+              path:'/jlmap3d/traffictrain',
+              query:{
+                  mapid:this.mapId,
+                  group:this.group,
+                  project: this.project,
+                  noPreLogout: true,
+                  lineCode:this.lineCode
+              }
+          });
+          window.open(routeData.href, '_blank', 'noopener noreferrer');
+        },
         jumpjl3dfaultdevice() {
             this.$emit('faultdevice');
         },
@@ -502,31 +539,6 @@ export default {
                     this.$message.error('获取课程ID失败！');
                 });
             }
-        },
-        changeOperateMode() {
-            this.faultMode = !this.faultMode;
-            let mode = OperateMode.NORMAL;
-            if (this.faultMode) {
-                mode = OperateMode.FAULT;
-            }
-            this.$store.dispatch('training/changeOperateMode', { mode: mode });
-        },
-        loadRunPlan() {
-            this.$emit('runPlanLoadShow');
-        },
-        viewRunPlan() {
-            const routeData = this.$router.resolve({
-                path:'/planSchedule/window',
-                query:{
-                    mapId:this.$route.query.mapId,
-                    group:this.$route.query.group,
-                    lineCode: this.$route.query.lineCode,
-                    project: this.$route.query.project,
-                    noPreLogout: true,
-                    initTime: this.$store.state.training.initTime
-                }
-            });
-            window.open(routeData.href, '_blank', 'noopener noreferrer');
         }
     }
 };
diff --git a/src/views/newMap/jointTrainingNew/menuSchema.vue b/src/views/newMap/jointTrainingNew/menuSchema.vue
index 75b80cf5f..0b3b072cf 100644
--- a/src/views/newMap/jointTrainingNew/menuSchema.vue
+++ b/src/views/newMap/jointTrainingNew/menuSchema.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height:100%">
-    <div v-if="project !== 'bjd'" class="schema" :style="{top: offset+'px'}">
+    <div class="schema" :style="{top: offset+'px'}">
       <el-select v-if="showSelectStation" v-model="chiShowStation" style="width: 100px;" size="small" @change="switchStationMode">
         <el-option v-for="item in stationList" :key="item.value" :label="item.name" :value="item.value" />
       </el-select>
@@ -107,14 +107,11 @@ export default {
         isScreen() {
             return this.$store.state.training.prdType === '07';
         },
-        // isCenter() {
-        //     return this.$store.state.training.prdType === '02';
-        // },
-        isShowDirective() { // 哈尔滨项目 行调设备显示
-            return this.$route.query.type == 'CW' && getSessionStorage('project') == 'heb';
-        },
         project() {
             return getSessionStorage('project');
+        },
+        isShowDirective() { // 哈尔滨项目 行调设备显示
+            return this.$route.query.type == 'CW' && this.project == 'heb';
         }
     },
     watch: {
@@ -192,22 +189,7 @@ export default {
             this.$emit('runPlanLoadShow');
         },
         viewRunPlan() {
-            if (this.$route.query.project === 'bjd') {
-                const routeData = this.$router.resolve({
-                    path:'/planSchedule/window',
-                    query:{
-                        mapId:this.$route.query.mapId,
-                        group:this.$route.query.group,
-                        lineCode: this.$route.query.lineCode,
-                        project: this.$route.query.project,
-                        noPreLogout: true,
-                        initTime: this.$store.state.training.initTime
-                    }
-                });
-                window.open(routeData.href, '_blank', 'noopener noreferrer');
-            } else {
-                this.$refs.runPlanView.doShow();
-            }
+            this.$refs.runPlanView.doShow();
         },
         // 选择车站
         switchStationMode(stationCode) {
diff --git a/src/views/newMap/mapsystemNew/common/index.vue b/src/views/newMap/mapsystemNew/common/index.vue
index f4310e478..530745f23 100644
--- a/src/views/newMap/mapsystemNew/common/index.vue
+++ b/src/views/newMap/mapsystemNew/common/index.vue
@@ -8,7 +8,8 @@
 
 <script>
 import { mapGetters } from 'vuex';
-import { getDeviceMenuByDeviceType, OperationEvent } from '@/scripts/ConstDic';
+import { getDeviceMenuByDeviceType } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import deviceType from '@/jmapNew/constant/deviceType.js';
 import JlmapVisual from '@/views/newMap/jlmapNew/index';
 import TrainingTips from '@/views/newMap/mapsystemNew/plugin/trainingtip';
diff --git a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
index 119dff1c3..60ad2ca11 100644
--- a/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
+++ b/src/views/newMap/newDesignUser/mapmanage/operateMenu.vue
@@ -47,10 +47,10 @@ export default {
     },
     data() {
         return {
-            publishMapMenu: {
-                label: this.$t('map.publish'),
-                handler: this.publish
-            },
+            // publishMapMenu: {
+            //     label: this.$t('map.publish'),
+            //     handler: this.publish
+            // },
             menuNormal: [],
             menu: [],
             updtModel: {
diff --git a/src/views/newMap/newMapdraft/mapoperate/section/index.vue b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
index 40c98290b..f328fd171 100644
--- a/src/views/newMap/newMapdraft/mapoperate/section/index.vue
+++ b/src/views/newMap/newMapdraft/mapoperate/section/index.vue
@@ -507,8 +507,8 @@ export default {
                     this.$emit('updateMapModel', models);
                     this.oldPoint = JSON.parse(JSON.stringify(model.points));
                     this.oldLeftSectionCode = model.leftSectionCode;
-					this.oldRightSectionCode = model.rightSectionCode;
-					this.field = '';
+                    this.oldRightSectionCode = model.rightSectionCode;
+                    this.field = '';
                 } else {
                     this.$message('还有属性未填写，修改未生效！');
                 }
diff --git a/src/views/planMonitor/editTool/index.vue b/src/views/planMonitor/editTool/index.vue
index 186b1cbc2..df85dbf94 100644
--- a/src/views/planMonitor/editTool/index.vue
+++ b/src/views/planMonitor/editTool/index.vue
@@ -32,8 +32,8 @@
       @dispatchOperate="dispatchOperate"
       @refresh="refresh"
     />
-    <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" />
-    <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" />
+    <!-- <edit-smooth-run-time ref="editSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
+    <!-- <add-smooth-run-time ref="addSmoothRunTime" @dispatchDialog="dispatchDialog" /> -->
     <duplicate-train ref="duplicateTrain" @dispatchDialog="dispatchDialog" @dispatchOperate="dispatchOperate" @refresh="refresh" />
     <modifying-routing ref="modifyingRouting" @dispatchDialog="dispatchDialog" />
     <modifying-begin-time ref="modifyingBeginTime" />
@@ -69,8 +69,8 @@ import ModifyingTask from './menus/modifyingTask';
 import ModifyingRouting from './menus/modifyingRouting';
 import ModifyingBeginTime from './menus/modifyingBeginTime';
 import EditStationBetweenTime from './menus/editStationBetweenTime';
-import AddSmoothRunTime from './menus/addSmoothRunTime';
-import EditSmoothRunTime from './menus/editSmoothRunTime';
+// import AddSmoothRunTime from './menus/addSmoothRunTime';
+// import EditSmoothRunTime from './menus/editSmoothRunTime';
 import ModifyingStationIntervalTime from './menus/modifyingStationIntervalTime';
 import PopulatingGenericData from './menus/populatingGenericData';
 import CreateEmptyPlan from './menus/createEmptyPlan';
@@ -99,8 +99,8 @@ export default {
         ModifyingRouting,
         ModifyingBeginTime,
         EditStationBetweenTime,
-        AddSmoothRunTime,
-        EditSmoothRunTime,
+        // AddSmoothRunTime,
+        // EditSmoothRunTime,
         ModifyingStationIntervalTime,
         CreateEmptyPlan,
         EditPlanName
diff --git a/src/views/planMonitor/editTool/menuBar.vue b/src/views/planMonitor/editTool/menuBar.vue
index a3c2effe2..c30dca8a4 100644
--- a/src/views/planMonitor/editTool/menuBar.vue
+++ b/src/views/planMonitor/editTool/menuBar.vue
@@ -164,11 +164,11 @@ export default {
                             title: '填充通用数据',
                             click: this.populatingGenericData
                             // disabledCallback: () => { return !this.$route.query.planId },
-                        },
-                        {
-                            title: '创建运行图',
-                            click: this.newRunPlan
                         }
+                        // {
+                        //     title: '创建运行图',
+                        //     click: this.newRunPlan
+                        // }
                     ]
                 },
                 {
@@ -429,9 +429,9 @@ export default {
         populatingGenericData() {
             this.$emit('dispatchDialog', { name: 'populatingGenericData', params: {} });
         },
-        newRunPlan() {
-            this.$emit('dispatchDialog', { name: 'createEmptyPlan', params: {}});
-        },
+        // newRunPlan() {
+        //     this.$emit('dispatchDialog', { name: 'createEmptyPlan', params: {}});
+        // },
         // 自动生成
         handleAutoGenerate() {
             this.$emit('dispatchDialog', { name: 'editSmoothRunTime', params: {} });
@@ -462,7 +462,8 @@ export default {
                 const query = {
                     prdType: '01', group: resp.data, mapId: this.$route.query.mapId, planId: this.$route.query.planId
                 };
-                this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                // this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                this.$router.push({ path: UrlConfig.design.testRunPlan, query: query });
                 launchFullscreen();
             }).catch(error => {
                 this.$messageBox(this.$t('tip.createSimulationFaild') + this.$t('global.colon') + error.message);
diff --git a/src/views/planMonitor/editTool/menus/addTask.vue b/src/views/planMonitor/editTool/menus/addTask.vue
index a8fe0d7bd..5cd5def09 100644
--- a/src/views/planMonitor/editTool/menus/addTask.vue
+++ b/src/views/planMonitor/editTool/menus/addTask.vue
@@ -404,8 +404,8 @@ export default {
                 arriveConfigList.push({arriveTime:'', departureTime:'', sectionCode:parkSectionCode.sectionCode, stationCode:parkSectionCode.stationCode});
             });
             this.$set(this.addModel, 'arriveConfigList', arriveConfigList);
-            // this.addModel.startStationCode = row.startStationCode;
-            // this.addModel.endStationCode = row.endStationCode;
+            this.addModel.startStationCode = row.startStationCode;
+            this.addModel.endStationCode = row.endStationCode;
             // this.addModel.endSectionCode = row.endSectionCode;
             // this.addModel.startSectionCode = row.startSectionCode;
             this.addModel.routingCode = row.code;
diff --git a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
index af105586e..0a2a9c436 100644
--- a/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/editTool/menus/editPlanningTrain.vue
@@ -104,6 +104,7 @@ export default {
             };
             getRoutingBySDTNumber(model).then(resp => {
                 const taskObj = {
+                    id:index + 1,
                     tripNumber: tripNumber,
                     startStationCode: resp.data.startStationCode,
                     startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
@@ -162,7 +163,6 @@ export default {
             });
         },
         loadInitData(params) {
-            debugger;
             this.isNew = params.isNew;
             this.model.planId = this.$route.query.planId;
             this.model.serviceNumber = params.serviceNumber;
@@ -199,7 +199,8 @@ export default {
             });
         },
         handleEditTask() {
-            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+            // routingCode || this.currentRow.tripNumber
+            if (this.currentRow.id) {
                 this.$emit('dispatchDialog', {
                     name: 'modifyingTask', params: {
                         isPlan: true,
@@ -213,38 +214,12 @@ export default {
             }
         },
         handleDeleteTask() {
-            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+            if (this.currentRow.id) {
                 let index = -1;
-                if (this.currentRow.routingCode) {
-                    index = this.model.tripConfigList.findIndex(
-                        elem => {
-                            return elem.routingCode == this.currentRow.routingCode &&
-                            elem.startTime == this.currentRow.startTime &&
-                            elem.endTime == this.currentRow.endTime;
-                        }
-                    );
-                } else {
-                    index = this.model.tripConfigList.findIndex(
-                        elem => { return elem.tripNumber == this.currentRow.tripNumber; }
-                    );
-                }
+                index = this.model.tripConfigList.findIndex(
+                    elem => { return elem.id == this.currentRow.id; }
+                );
                 this.model.tripConfigList.splice(index, 1);
-                // const tripConfigList = Object.assign([], this.model.tripConfigList);
-                // tripConfigList.forEach(tripConfig=>{
-                //     if (tripConfig.routingCode == model.routingCode) {
-                //         Object.assign(tripConfig, model);
-                //     }
-                // });
-                // this.model.tripConfigList = tripConfigList;
-
-                // this.$emit('dispatchDialog', {
-                //     name: 'deleteTask', params: {
-                //         isPlan: true,
-                //         routingCode: this.currentRow.routingCode,
-                //         serviceNumber: this.model.serviceNumber,
-                //         tripNumber: this.currentRow.tripNumber
-                //     }
-                // });
             } else {
                 this.$messageBox(this.$t('tip.selectAPieceOfData'));
             }
@@ -252,7 +227,7 @@ export default {
         handleConfirmUpdateTask(model) {
             const tripConfigList = Object.assign([], this.model.tripConfigList);
             tripConfigList.forEach(tripConfig=>{
-                if (tripConfig.routingCode == model.routingCode) {
+                if (tripConfig.id == model.id) {
                     Object.assign(tripConfig, model);
                 }
             });
@@ -272,6 +247,7 @@ export default {
             // } else {
             //     this.model.tripConfigList.push(model);
             // }
+            model.id = this.model.tripConfigList.length + 1;
             if (model.addToFront) {
                 this.model.tripConfigList = [model, ...this.model.tripConfigList];
             } else {
diff --git a/src/views/planMonitor/editTool/menus/modifyingTask.vue b/src/views/planMonitor/editTool/menus/modifyingTask.vue
index 886f5ccca..16af2256d 100644
--- a/src/views/planMonitor/editTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/editTool/menus/modifyingTask.vue
@@ -399,6 +399,7 @@ export default {
                 this.editModel.endTime = params.rowData.endTime;
                 this.editModel.endSectionCode = params.rowData.endSectionCode;
                 this.editModel.startSectionCode = params.rowData.startSectionCode;
+                this.editModel.id = params.rowData.id;
                 this.routingList = [];
                 this.routingList.push({
                     code:params.rowData.routingCode,
diff --git a/src/views/planMonitor/editTool/schedule.vue b/src/views/planMonitor/editTool/schedule.vue
index 8503c7cd1..f801276d1 100644
--- a/src/views/planMonitor/editTool/schedule.vue
+++ b/src/views/planMonitor/editTool/schedule.vue
@@ -8,15 +8,15 @@
         ref="serviceTable"
         class="data_table_box"
         :config="serviceNumberConfig"
-        @touch="scheduleTouch"
       />
+      <!-- @touch="scheduleTouch" -->
       <data-table
         ref="tripTable"
         style="margin-top: 3px;"
         class="data_table_box"
         :config="tripNumberConfig"
-        @touch="trainNumTouch"
       />
+      <!-- @touch="trainNumTouch" -->
     </div>
     <modify-service ref="modifyService" />
   </div>
@@ -106,8 +106,8 @@ export default {
                     }
                 ]
             },
-            realData: {},
-            kmRangeCoordMap: {},
+            // realData: {},
+            // kmRangeCoordMap: {},
             option: {
                 title: { // 标题
                     text: '',
@@ -253,18 +253,18 @@ export default {
         '$store.state.runPlan.refreshCount': function() {
             this.loadChartPage();
         },
-        $route() {
-            this.$nextTick(() => {
-                this.loadChartPage();
-            });
-        },
+        // $route() {
+        //     this.$nextTick(() => {
+        //         this.loadChartPage();
+        //     });
+        // },
         loadRunPlanId() {
             this.loadChartPage();
         }
     },
     mounted() {
         this.setPosition();
-        this.loadChartPage();
+        // this.loadChartPage();
     },
     beforeDestroy() {
         this.destroy();
@@ -526,9 +526,9 @@ export default {
                 this.viewDisabled = true;
 
                 this.option.series = [];
-                this.kmRangeCoordMap = this.planConvert.convertStationsToMap(stations);
+                const 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' }));
+                this.pushModels(this.option.series, this.planConvert.convertDataToModels(planData, stations, kmRangeCoordMap, { width: 0.5, color: '#000' }));
                 await this.loadInitChart();
 
                 this.viewDisabled = false;
@@ -704,13 +704,13 @@ export default {
                 this.myChart.dispose();
                 this.myChart = null;
             }
-        },
-        scheduleTouch() {
-
-        },
-        trainNumTouch() {
-
         }
+        // scheduleTouch() {
+
+        // },
+        // trainNumTouch() {
+
+        // }
     }
 };
 </script>
diff --git a/src/views/planMonitor/editTool/statusBar.vue b/src/views/planMonitor/editTool/statusBar.vue
index b8166a249..79e390e1a 100644
--- a/src/views/planMonitor/editTool/statusBar.vue
+++ b/src/views/planMonitor/editTool/statusBar.vue
@@ -151,7 +151,8 @@ export default {
                         const query = {
                             prdType: '01', group: resp.data, mapId: this.$route.query.mapId, planId: this.$route.query.planId
                         };
-                        this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                        // this.$router.push({ path: `${UrlConfig.display}/plan`, query: query });
+                        this.$router.push({ path: UrlConfig.design.testRunPlan, query: query });
                         launchFullscreen();
                     } else {
                         this.$messageBox(this.$t('error.checkTheValidityFirst'));
diff --git a/src/views/planMonitor/newEditTool/menus/addTask.vue b/src/views/planMonitor/newEditTool/menus/addTask.vue
index bca350c95..14ad27528 100644
--- a/src/views/planMonitor/newEditTool/menus/addTask.vue
+++ b/src/views/planMonitor/newEditTool/menus/addTask.vue
@@ -411,8 +411,8 @@ export default {
                 arriveConfigList.push({arriveTime:'', departureTime:'', sectionCode:parkSectionCode.sectionCode, stationCode:parkSectionCode.stationCode});
             });
             this.$set(this.addModel, 'arriveConfigList', arriveConfigList);
-            // this.addModel.startStationCode = row.startStationCode;
-            // this.addModel.endStationCode = row.endStationCode;
+            this.addModel.startStationCode = row.startStationCode;
+            this.addModel.endStationCode = row.endStationCode;
             // this.addModel.endSectionCode = row.endSectionCode;
             // this.addModel.startSectionCode = row.startSectionCode;
             this.addModel.routingCode = row.code;
diff --git a/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
index 368fc7ef7..6bd1bc492 100644
--- a/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
+++ b/src/views/planMonitor/newEditTool/menus/editPlanningTrain.vue
@@ -112,6 +112,7 @@ export default {
             };
             getRoutingBySDTNumber(model).then(resp => {
                 const taskObj = {
+                    id:index + 1,
                     tripNumber: tripNumber,
                     startStationCode: resp.data.startStationCode,
                     startTime: formatTime(trainInfo.stationTimeList[0].secondTime + 7200),
@@ -206,7 +207,8 @@ export default {
             });
         },
         handleEditTask() {
-            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+            // if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+            if (this.currentRow.id) {
                 this.$emit('dispatchDialog', {
                     name: 'modifyingTask', params: {
                         isPlan: true,
@@ -220,38 +222,12 @@ export default {
             }
         },
         handleDeleteTask() {
-            if (this.currentRow.routingCode || this.currentRow.tripNumber) {
+            if (this.currentRow.id) {
                 let index = -1;
-                if (this.currentRow.routingCode) {
-                    index = this.model.tripConfigList.findIndex(
-                        elem => {
-                            return elem.routingCode == this.currentRow.routingCode &&
-                            elem.startTime == this.currentRow.startTime &&
-                            elem.endTime == this.currentRow.endTime;
-                        }
-                    );
-                } else {
-                    index = this.model.tripConfigList.findIndex(
-                        elem => { return elem.tripNumber == this.currentRow.tripNumber; }
-                    );
-                }
+                index = this.model.tripConfigList.findIndex(
+                    elem => { return elem.id == this.currentRow.id; }
+                );
                 this.model.tripConfigList.splice(index, 1);
-                // const tripConfigList = Object.assign([], this.model.tripConfigList);
-                // tripConfigList.forEach(tripConfig=>{
-                //     if (tripConfig.routingCode == model.routingCode) {
-                //         Object.assign(tripConfig, model);
-                //     }
-                // });
-                // this.model.tripConfigList = tripConfigList;
-
-                // this.$emit('dispatchDialog', {
-                //     name: 'deleteTask', params: {
-                //         isPlan: true,
-                //         routingCode: this.currentRow.routingCode,
-                //         serviceNumber: this.model.serviceNumber,
-                //         tripNumber: this.currentRow.tripNumber
-                //     }
-                // });
             } else {
                 this.$messageBox(this.$t('tip.selectAPieceOfData'));
             }
@@ -259,7 +235,7 @@ export default {
         handleConfirmUpdateTask(model) {
             const tripConfigList = Object.assign([], this.model.tripConfigList);
             tripConfigList.forEach(tripConfig=>{
-                if (tripConfig.routingCode == model.routingCode) {
+                if (tripConfig.id == model.id) {
                     Object.assign(tripConfig, model);
                 }
             });
@@ -279,6 +255,7 @@ export default {
             // } else {
             //     this.model.tripConfigList.push(model);
             // }
+            model.id = this.model.tripConfigList.length + 1;
             if (model.addToFront) {
                 this.model.tripConfigList = [model, ...this.model.tripConfigList];
             } else {
diff --git a/src/views/planMonitor/newEditTool/menus/modifyingTask.vue b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue
index 3c9d5530e..bbbb9b23b 100644
--- a/src/views/planMonitor/newEditTool/menus/modifyingTask.vue
+++ b/src/views/planMonitor/newEditTool/menus/modifyingTask.vue
@@ -399,6 +399,7 @@ export default {
                 this.editModel.endTime = params.rowData.endTime;
                 this.editModel.endSectionCode = params.rowData.endSectionCode;
                 this.editModel.startSectionCode = params.rowData.startSectionCode;
+                this.editModel.id = params.rowData.id;
                 this.routingList = [];
                 this.routingList.push({
                     code:params.rowData.routingCode,
diff --git a/src/views/planSchedule/schedule.vue b/src/views/planSchedule/schedule.vue
index f15e178c2..63a7c2317 100644
--- a/src/views/planSchedule/schedule.vue
+++ b/src/views/planSchedule/schedule.vue
@@ -141,7 +141,7 @@ export default {
         },
         async analyticalServiceNumber(data) {
             this.serviceNumberConfig.data = Object.keys(data || {})
-                .sort((a, b) => { return data[a].oldIndex - data[b].oldIndex; })
+                .sort((a, b) => { return parseInt(data[a].serviceNumber) - parseInt(data[b].serviceNumber); })
                 .map(serviceNumber => { return { serviceNumber }; });
         },
         async analyticalTripNumber(data) {
@@ -468,6 +468,7 @@ export default {
             }
         },
         destroy() {
+            this.PlanConvert = null;
             if (this.myChart && this.myChart.isDisposed) {
                 this.myChart.dispose();
                 this.myChart = null;
diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue
index 1279bbf3d..f776b8cea 100644
--- a/src/views/publish/examRule/draft/rule.vue
+++ b/src/views/publish/examRule/draft/rule.vue
@@ -27,7 +27,6 @@
 
 <script>
 import { getExamLessonDetail, setCourseList, setCourseListGzb } from '@/api/management/exam';
-// import { getDetailList } from '@/api/management/dictionary';
 import { UrlConfig, getTrainingOperateTypeMap } from '@/scripts/ConstDic';
 import editRule from './editRule';
 import LangStorage from '@/utils/lang';
diff --git a/src/views/publish/publishMap/draft.vue b/src/views/publish/publishMap/draft.vue
index 31975d4a4..7f0df3768 100644
--- a/src/views/publish/publishMap/draft.vue
+++ b/src/views/publish/publishMap/draft.vue
@@ -61,8 +61,8 @@ export default {
             this.formModel.mapId = row.id;
             this.formModel.name = row.name;
             this.formModel.lineCode = row.lineCode;
-            this.cityList = cityList.map(elem => { return { value: elem.code, label: elem.name }; });
-            this.lineCodeList = lineCodeList.map(elem => { return { value: elem.code, label: elem.name }; });
+            this.cityList = cityList;
+            this.lineCodeList = lineCodeList;
             this.formModel.cityCode = row.cityCode;
             this.dialogVisible = true;
         },
diff --git a/src/views/publish/publishMap/index.vue b/src/views/publish/publishMap/index.vue
index 69d15c0ff..d651f8ad6 100644
--- a/src/views/publish/publishMap/index.vue
+++ b/src/views/publish/publishMap/index.vue
@@ -6,12 +6,13 @@
     <copy-map ref="copyMap" @refresh="reloadTable" />
     <local-map ref="localMap" />
     <export-map ref="exportMap" />
+    <map-sort ref="mapSort" />
     <!--<input ref="files" type="file" class="file_box" accept=".json, application/json" style="display: none" @change="importf">-->
   </div>
 </template>
 
 <script>
-import { getPublishMapList, delPublishMap, putMapOnLine, putMapOffLine, simulationCheck, localImportMap, updatePublishMapInfo, getPublishMapExport, getPublishMapImportNew } from '@/api/jmap/map';
+import { getPublishMapList, delPublishMap, putMapOnLine, putMapOffLine, simulationCheck, localImportMap, updatePublishMapInfo, getPublishMapExport, getPublishMapImportNew, generateAncillaryData } from '@/api/jmap/map';
 import { getLineCodeList } from '@/api/management/mapline';
 import localStore from 'storejs';
 import UpdateOperate from './draft.vue';
@@ -19,6 +20,7 @@ import SetProject from './project';
 import CopyMap from './copy';
 import LocalMap from './localMap';
 import ExportMap from './exportMap';
+import MapSort from './mapSort';
 import { superAdmin } from '@/router/index_APP_TARGET';
 import { ProjectList } from '@/scripts/ProjectConfig';
 
@@ -29,7 +31,8 @@ export default {
         SetProject,
         CopyMap,
         LocalMap,
-        ExportMap
+        ExportMap,
+        MapSort
     },
     data() {
         return {
@@ -77,14 +80,14 @@ export default {
                         title: this.$t('publish.city'),
                         prop: 'cityCode',
                         type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.cityCode, this.cityList, ['code', 'name']); },
+                        columnValue: (row) => { return this.$convertField(row.cityCode, this.cityList, ['value', 'label']); },
                         tagType: (row) => { return 'success'; }
                     },
                     {
                         title: this.$t('publish.lineType'),
                         prop: 'lineCode',
                         type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.lineCode, this.lineCodeList, ['code', 'name']); },
+                        columnValue: (row) => { return this.$convertField(row.lineCode, this.lineCodeList, ['value', 'label']); },
                         tagType: (row) => { return ''; }
                     },
                     {
@@ -136,6 +139,10 @@ export default {
                                 name: this.$t('publish.simulationDataCheck'),
                                 handleClick: this.handleSimulationCheck
                             },
+                            {
+                                name: '生成子系统及权限',
+                                handleClick: this.handleGenerateAncillaryData
+                            },
                             {
                                 name: '导入',
                                 handleClick: this.handleImportMap,
@@ -158,8 +165,8 @@ export default {
                 ],
                 actions: [
                     { text: '地图排序', handler: this.mapSort },
-                    { text: '导出', handler: this.localExport, show: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0; }},
-                    { text: '导入', handler: this.localImport, fileType: 'file', show: () => { return this.$store.state.user.roles.indexOf(superAdmin) > 0; }}
+                    { text: '导出', handler: this.localExport, show: () => { return this.$store.state.user.roles.includes(superAdmin); }},
+                    { text: '导入', handler: this.localImport, fileType: 'file', show: () => { return this.$store.state.user.roles.includes(superAdmin); }}
                 ]
             },
 
@@ -178,20 +185,20 @@ export default {
         loadInitData() {
             this.cityList = [];
             this.$Dictionary.cityType().then(list => {
-                this.cityList = list;
-                this.cityList.forEach(elem => {
-                    this.queryForm.queryObject.cityCode.config.data.push({ value: elem.code, label: elem.name });
+                list.forEach(elem => {
+                    this.cityList.push({ value: elem.code, label: elem.name });
                 });
+                this.queryForm.queryObject.cityCode.config.data = this.cityList;
             }).catch(() => {
                 this.$messageBox(this.$t('error.loadingCityListFailed'));
             });
 
             this.lineCodeList = [];
             getLineCodeList().then(response => {
-                this.lineCodeList = response.data;
-                this.lineCodeList.forEach(elem => {
-                    this.queryForm.queryObject.lineCode.config.data.push({ value: elem.code, label: elem.name });
+                response.data.forEach(elem => {
+                    this.lineCodeList.push({ value: elem.code, label: elem.name });
                 });
+                this.queryForm.queryObject.lineCode.config.data = this.lineCodeList;
             });
         },
         handleSetProject(index, row) {
@@ -279,20 +286,6 @@ export default {
 
         // 导出地图 exls
         async handleExportMapSame(index, row, idx) {
-            // const res = await getPublishMapExport(row.id);
-            // const resultData = res.data;
-            // if (resultData === false) {
-            //     return;
-            // }
-            //
-            // const self = this;
-            // import('@/utils/Export2Excel').then(excel => {
-            //     self.queryExportDataSame(resultData).then(data => {
-            //         excel.export_json_excel_same(data, resultData.name);
-            //     }).catch(error => {
-            //         self.$message.error(`${this.$t('error.exportException')}:${error.message}`);
-            //     });
-            // });
             this.$confirm('您是否导出地图数据？', this.$t('global.tips'), {
                 confirmButtonText: this.$t('global.confirm'),
                 cancelButtonText: this.$t('global.cancel'),
@@ -344,38 +337,8 @@ export default {
         formatJson(filterVal, jsonData) {
             return jsonData.map(v => filterVal.map(j => v[j]));
         },
-        // // 格式化数据列表
-        // queryExportData(data) {
-        //     return new Promise((resolve, reject) => {
-        //         const result = {
-        //             base: []
-        //         };
-        //         const obj = {};
-        //         const list = ['graphData', 'logicData'];
-        //         for (const i in data) {
-        //             if (list.includes(i)) {
-        //                 for (const v in data[i]) {
-        //                     if (data[i][v].length) {
-        //                         result[v] = [...data[i][v]];
-        //                     } else if (v == 'skinVO') {
-        //                         result[v] = [data[i][v]];
-        //                     }
-        //                 }
-        //             } else if (data[i] instanceof Object || typeof data[i] != 'object') {
-        //                 obj[i] = data[i];
-        //             } else if (data[i] instanceof Array) {
-        //                 if (data[i].length) {
-        //                     obj[i] = [...data[i]];
-        //                 }
-        //             }
-        //         }
-
-        //         result.base.push(obj);
-        //         resolve(result);
-        //     });
-        // },
         mapSort() {
-            this.$router.push({ path: `/publish/mapSort`});
+            this.$refs.mapSort.doShow({cityList:this.cityList});
         },
         localExport() {
             this.$refs['localMap'].doShow();
@@ -433,124 +396,20 @@ export default {
                     obj.value = '';
                 };
             });
+        },
+        handleGenerateAncillaryData(index, row) {
+            this.$confirm('是否生成子系统及权限？', this.$t('global.tips'), {
+                confirmButtonText: this.$t('global.confirm'),
+                cancelButtonText: this.$t('global.cancel'),
+                type: 'warning'
+            }).then(() => {
+                generateAncillaryData(row.id).then(response => {
+                    this.$message.success('生成子系统及权限成功！');
+                }).catch(() => {
+                    this.$messageBox('生成子系统及权限失败！');
+                });
+            }).catch(() => { });
         }
-        // // 格式化数据列表
-        // queryExportDataSame(data) {
-        //     const mapProps = {};
-
-        //     mapProps['stationStandList'] = {
-        //         filter: item => { return true; },
-        //         propList: {
-        //             'direction': item => {
-        //                 switch (item.direction) {
-        //                 case '01': return '下行';
-        //                 case '02': return '上行';
-        //                 default: return '未知';
-        //                 }
-        //             },
-        //             'name': (item, devices) =>{
-        //                 let name = '';
-        //                 if (item.stationCode) {
-        //                     const stationList = devices['stationList'];
-        //                     const station = stationList.find(elem => { return item.stationCode == elem.code; });
-        //                     if (station) {
-        //                         name = station.name;
-        //                     }
-        //                 }
-        //                 return name;
-        //             },
-        //             'code': item => {
-        //                 return item.code;
-        //             }
-        //         }
-        //     };
-        //     mapProps['switchList'] = {
-        //         filter: item => { return true; },
-        //         propList: {
-        //             'name': item =>{
-        //                 return item.name;
-        //             },
-        //             'code': item => {
-        //                 return item.code;
-        //             }
-        //         }
-        //     };
-        //     mapProps['signalList'] = {
-        //         filter: item => { return true; },
-        //         propList: {
-        //             'name': item =>{
-        //                 return item.name;
-        //             },
-        //             'code': item => {
-        //                 return item.code;
-        //             }
-        //         }
-        //     };
-        //     mapProps['sectionList'] = {
-        //         filter: item => { return item.type == '01'; },
-        //         propList: {
-        //             'name': (item, devices) =>{
-        //                 let name = item.name;
-        //                 if (item.isSwitchSection) {
-        //                     const swchList = devices['switchList'];
-        //                     const swch = swchList.find(elem => { return item.relSwitchCode == elem.code; });
-        //                     if (swch) {
-        //                         if (item.code == swch.sectionACode) {
-        //                             name = `${name} (${swch.name}-A)`;
-        //                         } else if (item.code == swch.sectionBCode) {
-        //                             name = `${name} (${swch.name}-B)`;
-        //                         } else if (item.code == swch.sectionCCode) {
-        //                             name = `${name} (${swch.name}-C)`;
-        //                         }
-        //                     }
-        //                 }
-
-        //                 return name;
-        //             },
-        //             'code': item => {
-        //                 return item.code;
-        //             }
-        //         }
-        //     };
-
-        //     return new Promise((resolve, reject) => {
-        //         const result = {
-        //             base: []
-        //         };
-        //         const obj = {};
-        //         const list = ['graphData', 'logicData'];
-        //         for (const i in data) {
-        //             if (list.includes(i)) {
-        //                 for (const v in data[i]) {
-        //                     if (data[i][v].length) {
-        //                         if (mapProps[v]) {
-        //                             const list = [];
-        //                             data[i][v].forEach(device => {
-        //                                 if (mapProps[v].filter(device)) {
-        //                                     const obj = {};
-        //                                     Object.keys(mapProps[v].propList || []).forEach(key => {
-        //                                         obj[key] = mapProps[v].propList[key](device, data[i]);
-        //                                     });
-        //                                     list.push(obj);
-        //                                 }
-        //                             });
-        //                             result[v] = list;
-        //                         }
-        //                     }
-        //                 }
-        //             } else if (data[i] instanceof Object || typeof data[i] != 'object') {
-        //                 obj[i] = data[i];
-        //             } else if (data[i] instanceof Array) {
-        //                 if (data[i].length) {
-        //                     obj[i] = [...data[i]];
-        //                 }
-        //             }
-        //         }
-
-        //         result.base.push(obj);
-        //         resolve(result);
-        //     });
-        // }
     }
 };
 </script>
diff --git a/src/views/publish/publishMap/mapSort.vue b/src/views/publish/publishMap/mapSort.vue
index 0a6bd6f7e..55b319424 100644
--- a/src/views/publish/publishMap/mapSort.vue
+++ b/src/views/publish/publishMap/mapSort.vue
@@ -1,54 +1,54 @@
 <template>
-  <div class="card-box steps">
-    <el-steps :active="display">
-      <el-step :title="this.$t('system.mapSort')" icon="el-icon-edit-outline" />
-      <el-step title="" icon="el-icon-upload" />
-    </el-steps>
-    <el-card class="forms">
-      <filter-city ref="filerCity" filter-empty :query-function="queryFunction" :local-param-name="localParamName" @filterSelectChange="refresh" />
-      <div style="height:100%;overflow-y:auto">
-        <el-tree
-          ref="mapTree"
-          :data="treeData"
-          :props="defaultProps"
-          draggable
-          :allow-drop="allowDrop"
-          default-expand-all
-          :allow-drag="allowDrag"
-          expand-on-click-node
-          highlight-current
-          style="margin:20px; min-height:300px;"
-          @node-drag-end="handleDragEnd"
-        />
-      </div>
-    </el-card>
-    <div class="draft">
-      <el-button type="primary" @click="goback">{{ $t('global.back') }}</el-button>
+  <el-dialog v-dialogDrag title="地图排序 (拖拽地图名称排序) " :visible.sync="dialogVisible" width="500px" center>
+    <el-select v-model="filterSelect" class="selectCity" size="medium" popper-class="select" @change="refresh">
+      <el-option v-for="item in cityList" :key="item.value" :label="item.label" :value="item.value" />
+    </el-select>
+    <div style="height:100%;overflow-y:auto" class="forms">
+      <el-tree
+        ref="mapTree"
+        :data="treeData"
+        :props="defaultProps"
+        draggable
+        :allow-drop="allowDrop"
+        default-expand-all
+        :allow-drag="allowDrag"
+        expand-on-click-node
+        highlight-current
+        style="margin:20px; min-height:300px;"
+        @node-drag-end="handleDragEnd"
+      />
     </div>
-  </div>
+    <div class="closeBtn">
+      <el-button type="primary" @click="goback">{{ $t('global.close') }}</el-button>
+    </div>
+  </el-dialog>
 </template>
 
 <script>
-import FilterCity from '@/views/components/filterCity';
 import { listPublishMap, toSortMap } from '@/api/jmap/map';
 export default {
     name: 'SortTree',
-    components: {
-        FilterCity
-    },
     data() {
         return {
-            display: 1,
+            dialogVisible:false,
+            cityList:[],
+            filterSelect:'',
             treeData: [],
-            queryFunction: listPublishMap,
             defaultProps: {
                 children: 'children',
                 label: 'name'
-            },
-            localParamName: 'publish_cityCode'
+            }
         };
     },
     methods: {
+        doShow({cityList}) {
+            this.cityList = cityList;
+            this.dialogVisible = true;
+            if (this.cityList.length > 0) {
+                this.filterSelect = this.cityList[0].value;
+                this.refresh(this.filterSelect);
+            }
+        },
         async refresh(filterSelect) {
             this.loading = true;
             this.treeData = this.treeList = [];
@@ -80,7 +80,7 @@ export default {
             });
         },
         goback() {
-            this.$router.go(-1);
+            this.dialogVisible = false;
         }
     }
 };
@@ -88,39 +88,15 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
     @import "src/styles/mixin.scss";
 
+    .selectCity{
+        width:100%;
+    }
     .el-tree-node.is-current>.el-tree-node__content {
         background-color: #e4e3e3 !important;
     }
-
-    .card-box {
-        padding-top: 20px;
-    }
-
-    .steps {
-        width: 980px;
-        margin: 0 auto;
-        height: 100%;
-
-        /deep/ {
-            .el-step__icon.is-icon {
-                width: 95px;
-            }
-        }
-    }
-
-    /deep/ .el-card__body{
-        height:100%;
-    }
-
-    .forms {
-        width: 800px;
-        margin: 0 auto;
-        margin-top: 10px;
-        height: calc(100% - 150px);
-    }
-    .draft {
-        width: 300px;
+    .closeBtn{
         text-align: center;
-        margin: 20px auto;
+        display: inline-block;
+        width: 100%;
     }
 </style>
diff --git a/src/views/publish/runPlanCommon/index.vue b/src/views/publish/runPlanCommon/index.vue
index 79db93f09..1885b5131 100644
--- a/src/views/publish/runPlanCommon/index.vue
+++ b/src/views/publish/runPlanCommon/index.vue
@@ -56,7 +56,7 @@ export default {
                         type: 'button',
                         title: this.$t('global.operate'),
                         width: '450',
-                        hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
+                        hide: () => { return !this.$store.state.user.roles.includes(superAdmin); },
                         buttons: [
                             {
                                 name: this.$t('global.preview'),
diff --git a/src/views/publish/runPlanEveryDay/index.vue b/src/views/publish/runPlanEveryDay/index.vue
index 6021c0fe9..30b16b6d0 100644
--- a/src/views/publish/runPlanEveryDay/index.vue
+++ b/src/views/publish/runPlanEveryDay/index.vue
@@ -66,7 +66,7 @@ export default {
                         type: 'button',
                         title: this.$t('global.operate'),
                         width: '250',
-                        hide: (row) => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
+                        hide: (row) => { return !this.$store.state.user.roles.includes(superAdmin); },
                         buttons: [
                             {
                                 name: this.$t('global.preview'),
diff --git a/src/views/publish/runPlanTemplate/index.vue b/src/views/publish/runPlanTemplate/index.vue
index 822513796..da6dbdd0f 100644
--- a/src/views/publish/runPlanTemplate/index.vue
+++ b/src/views/publish/runPlanTemplate/index.vue
@@ -66,7 +66,7 @@ export default {
                         type: 'button',
                         title: this.$t('global.operate'),
                         width: '550',
-                        hide: () => { return this.$store.state.user.roles.indexOf(superAdmin) < 0; },
+                        hide: () => { return !this.$store.state.user.roles.includes(superAdmin); },
                         buttons: [
                             {
                                 name: this.$t('publish.generateRunPlan'),
diff --git a/src/views/scriptManage/allScriptRole.vue b/src/views/scriptManage/allScriptRole.vue
index f32d3ea3f..0b678f8ff 100644
--- a/src/views/scriptManage/allScriptRole.vue
+++ b/src/views/scriptManage/allScriptRole.vue
@@ -80,7 +80,7 @@ export default {
     },
     methods:{
         filterNode(value, data) {
-            return data.label.indexOf(value) !== -1;
+            return data.label.includes(value);
         },
         changeRole(member) {
             if (member) {
diff --git a/src/views/scriptManage/getAction.vue b/src/views/scriptManage/getAction.vue
index ffb453003..680ea6108 100644
--- a/src/views/scriptManage/getAction.vue
+++ b/src/views/scriptManage/getAction.vue
@@ -127,7 +127,6 @@ export default {
             const memberName = member.type + member.deviceName + (member.name ? member.name : '');
             switch (element.type) {
             case 'Start_Conversation': {
-                // isStartCoversition
                 const targetNameList = [];
                 if (element.communicationObject) {
                     if (element.communicationObject == 'ALL_STATION') {
@@ -165,25 +164,6 @@ export default {
                 // const command = CommandHandler.getScriptDefinition(element.operationType);
                 const commandName = element.operationType;
                 if (commandName != 'Set_Fault' && commandName != 'Cancel_Fault' ) {
-                    // const list = ['Train_Update_Type',
-                    //     'Train_Add_Train_Trace',
-                    //     'Train_Remove_Train_Trace',
-                    //     'Train_Move_Train_Trace',
-                    //     'Train_Set_Plan',
-                    //     'Train_Set_Head',
-                    //     'Train_Set_Manual',
-                    //     'Train_Set_Crew_Number',
-                    //     'Train_Tag_Atp_Cut',
-                    //     'Train_Tag_Atp_Recover',
-                    //     'Train_Allow_Pass',
-                    //     'Train_Info'];
-                    // let operateType = commandName.split('_')[0];
-                    // if (list.includes(commandName)) {
-                    //     operateType = 'TrainWindow';
-                    // }
-                    // if (operateType == 'CM') {
-                    //     operateType = 'ControlConvertMenu';
-                    // }
                     let operateName = null;
                     let operateType = '';
                     Object.keys(CMD).forEach(key => {
@@ -195,7 +175,6 @@ export default {
                             }
                         });
                     });
-                    // const operateName = Object.values(CMD[operateType]).find(res=>{ return res.value == commandName; });
                     if (operateName) {
                         const deviceTypeList = {Section:'区段', Switch:'道岔', Signal:'信号机', Stand:'站台', Station:'车站', TrainWindow:'车次窗', ControlConvertMenu:'控制模式', Driver:'司机', Train:'列车'};
                         const operateTypeName = deviceTypeList[operateType];
diff --git a/src/views/scriptManage/home.vue b/src/views/scriptManage/home.vue
index 7fbbc7bc6..c76281bd7 100644
--- a/src/views/scriptManage/home.vue
+++ b/src/views/scriptManage/home.vue
@@ -249,7 +249,7 @@ export default {
             // }
         },
         covertButtonname() {
-            if (this.$store.getters.roles.indexOf(admin) >= 0 || this.$store.getters.roles.indexOf(superAdmin) >= 0) {
+            if (this.$store.getters.roles.includes(admin) || this.$store.getters.roles.includes(superAdmin)) {
                 return this.$t('scriptRecord.publish');
             } else {
                 return this.$t('scriptRecord.applyPublish');
diff --git a/src/views/scriptManage/tipScriptRecord.vue b/src/views/scriptManage/tipScriptRecord.vue
index 07ecf0032..2f96b6e7f 100644
--- a/src/views/scriptManage/tipScriptRecord.vue
+++ b/src/views/scriptManage/tipScriptRecord.vue
@@ -12,7 +12,6 @@
                     <span style="font-size:13px;">{{ getRoleName(memberId) }}</span>
                   </div>
                   <div class="quickChange">
-                    <!-- <div class="quickChange_head">快捷切换</div> -->
                     <div class="quickChangeList" style="margin:10px 0px 10px 0px;overflow-y:auto;height:200px;">
                       <div v-for="member in quickChangeMember.list" :key="member.id" class="setGroupOut">
                         <span style="font-size: 14px">{{ member.normalName }}</span>
@@ -216,14 +215,12 @@ export default {
                     type: 'role',
                     children: result.deviceListData[7]
                 }
-                // PARENT_DEPARTMENT
                 ];
                 this.memberList = result.lastMemberList;
             }
         },
         // 按计划行车的列车列表更新(更新司机列表)
         '$store.state.map.activeTrainListChange': function (val) {
-            // driverList
             const activeTrainList = this.$store.state.map.activeTrainList;
             if (this.driverList.length > 0) {
                 const driverList = [];
diff --git a/src/views/system/commandDictionary/copyParam.vue b/src/views/system/commandDictionary/copyParam.vue
index 7ced5e307..d6ab4c118 100644
--- a/src/views/system/commandDictionary/copyParam.vue
+++ b/src/views/system/commandDictionary/copyParam.vue
@@ -32,7 +32,6 @@ export default {
             dialogVisible: false,
             formModel: {
                 fromCode: '',
-                fromName: '',
                 targetIds: '',
                 deviceType: []
             },
@@ -44,8 +43,8 @@ export default {
             const form = {
                 labelWidth: '100px',
                 items: [
-                    { prop: 'fromName', label: '源线路', type: 'text', disabled: true },
-                    { prop: 'targetIds', label:'拷贝线路', type: 'select', options: this.targetList, multiple: true },
+                    { prop: 'fromCode', label: '源线路', type: 'select', options: this.originList, change:true, onChange:this.originChange},
+                    { prop: 'targetIds', label:'拷贝线路', type: 'select', options: this.targetList, multiple: true, deviceChange: this.targetChange },
                     { prop: 'deviceType', label: '操作对象', type: 'select', options: this.deviceTypeList, multiple: true }
                 ]
             };
@@ -53,7 +52,7 @@ export default {
         },
         rules() {
             return {
-                fromName: [
+                fromCode: [
                     { required: true, message: '请选择拷贝源线路', trigger: 'blur' }
                 ],
                 targetIds: [
@@ -63,19 +62,14 @@ export default {
         }
     },
     methods: {
-        doShow(lineCode) {
+        doShow() {
             this.dialogVisible = true;
-            if (lineCode) {
-                this.targetList = [];
-                this.taskStatusList.forEach(item => {
-                    if (item.value != lineCode) {
-                        this.targetList.push(item);
-                    } else {
-                        this.formModel.fromCode = item.value;
-                        this.formModel.fromName = item.label;
-                    }
-                });
-            }
+            this.targetList = [];
+            this.originList = [];
+            this.taskStatusList.forEach(item => {
+                this.targetList.push(item);
+                this.originList.push(item);
+            });
         },
         doSave() {
             this.$refs.dataform.validateForm(() => {
@@ -93,6 +87,28 @@ export default {
         handleClose() {
             this.$refs.dataform.resetForm();
             this.dialogVisible = false;
+        },
+        originChange(fromCode) {
+            this.formModel.fromCode = fromCode;
+            this.formModel.targetIds = '';
+            this.targetList = this.targetList.map(each=>{
+                if (each.value == fromCode) {
+                    each.disabled = true;
+                } else {
+                    each.disabled = false;
+                }
+                return each;
+            });
+        },
+        targetChange(targetIds) {
+            this.originList = this.originList.map(each=>{
+                if (targetIds.includes(each.value)) {
+                    each.disabled = true;
+                } else {
+                    each.disabled = false;
+                }
+                return each;
+            });
         }
     }
 };
diff --git a/src/views/system/commandDictionary/index.vue b/src/views/system/commandDictionary/index.vue
index f73039cd4..dfc9cf762 100644
--- a/src/views/system/commandDictionary/index.vue
+++ b/src/views/system/commandDictionary/index.vue
@@ -126,9 +126,7 @@ export default {
                     { text: this.$t('global.add'), handler: this.handleAdd },
                     { text: '复刻', handler: this.handleCopyAll }
                 ]
-            },
-
-            currentModel: {}
+            }
         };
     },
     mounted () {
@@ -201,8 +199,8 @@ export default {
                 cancelButtonText: this.$t('global.cancel'),
                 type: 'warning'
             }).then(() => {
-                const param = row;
-                createCommand(param).then(response => {
+                // const param = row;
+                createCommand(row).then(response => {
                     this.$message.success('复制指令成功！');
                 }).catch(error => {
                     console.log(error);
@@ -212,13 +210,12 @@ export default {
         },
         // 复制线路到其他线路 操作
         handleCopyAll() {
-            this.$refs.copyParam.doShow(this.lineCode);
+            this.$refs.copyParam.doShow();
         },
         reloadTable() {
             this.queryList.reload();
         },
         convertField(list, status) {
-            console.log(list, typeof list, status);
             if (list && list.length > 0) { return list.find(each=>{ return status == each.value; }).label; }
         }
     }
diff --git a/src/views/system/configLine/config.vue b/src/views/system/configLine/config.vue
index cabcd67ce..1c4f1d42a 100644
--- a/src/views/system/configLine/config.vue
+++ b/src/views/system/configLine/config.vue
@@ -59,9 +59,6 @@
 import { getRealLineConfigList, putRealLineConfig } from '@/api/management/mapline';
 export default {
     name: 'Config',
-    components: {
-        // EditConfig
-    },
     props: {
         type: {
             type: String,
@@ -146,21 +143,21 @@ export default {
                         let rangeStart = 0;
                         let rangeEnd = 0;
                         let options = [];
-                        if (this.booleanList.indexOf(key) >= 0) {
+                        if (this.booleanList.includes(key)) {
                             type = 'boolean';
-                        } else if (this.selectList.indexOf(key) >= 0) {
+                        } else if (this.selectList.includes(key)) {
                             type = 'select';
                             options = this.optionsMap[key];
-                        } else if (this.numberList.indexOf(key) >= 0) {
+                        } else if (this.numberList.includes(key)) {
                             type = 'number';
-                        } else if (this.rangeList.indexOf(key) >= 0) {
+                        } else if (this.rangeList.includes(key)) {
                             type = 'range';
                             if (res.data[key]) {
                                 const ranges = res.data[key].split('-');
                                 rangeStart = ranges[0];
                                 rangeEnd = ranges[1];
                             }
-                        } else if (this.speedList.indexOf(key) >= 0) {
+                        } else if (this.speedList.includes(key)) {
                             type = 'speed';
                         } else {
                             type = 'input';
@@ -195,13 +192,6 @@ export default {
                 this.dialogVisible = false;
             }
         },
-        addModel() {
-            this.$refs.addConfig.show();
-        },
-        editModel(item, index) {
-            this.$refs.editConfig.show(item);
-            this.index = index;
-        },
         save() {
             const param = {};
             this.generalData.forEach(item => {
diff --git a/src/views/system/configLine/edit.vue b/src/views/system/configLine/edit.vue
index 39bc23891..9b13195b2 100644
--- a/src/views/system/configLine/edit.vue
+++ b/src/views/system/configLine/edit.vue
@@ -12,12 +12,6 @@
 import { addSkinCode, updateSkinCode } from '@/api/management/mapline';
 export default {
     name: 'DictionaryEdit',
-    props: {
-        type: {
-            type: String,
-            required: true
-        }
-    },
     data() {
         return {
             dialogVisible: false,
@@ -27,20 +21,21 @@ export default {
                 name: '',
                 origin: { x: 0, y: 0 },
                 scaling: 1
-            }
+            },
+            isAdd:false,
+            title:''
         };
     },
     computed: {
         form() {
-            const isAdd = this.type === 'ADD';
             const form = {
                 labelWidth: '100px',
                 items: [
-                    { prop: 'code', label: this.$t('system.code'), type: 'text', disabled: !isAdd },
+                    { prop: 'code', label: this.$t('system.code'), type: 'text', disabled: !this.isAdd },
                     { prop: 'name', label: this.$t('system.name'), type: 'text' },
                     { prop: 'origin', label: '坐标:', type: 'coordinate', children: [
-                        { prop: 'origin.x', firstLevel: 'origin', secondLevel: 'x', label: 'x', type: 'number', labelWidth: '20px'},
-                        { prop: 'origin.y', firstLevel: 'origin', secondLevel: 'y', label: 'y', type: 'number', labelWidth: '20px'}
+                        { prop: 'origin.x', firstLevel: 'origin', secondLevel: 'x', label: 'x', type: 'number', labelWidth: '30px'},
+                        { prop: 'origin.y', firstLevel: 'origin', secondLevel: 'y', label: 'y', type: 'number', labelWidth: '30px'}
                     ] },
                     { prop: 'scaling', label: '缩放比例:', type: 'number', min: 0.4, max: 8, step: 0.2 }
                 ]
@@ -49,6 +44,9 @@ export default {
         },
         rules() {
             const crules = {
+                code: [
+                    { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' }
+                ],
                 name: [
                     { required: true, message: this.$t('rules.pleaseInputName'), trigger: 'blur' }
                 ],
@@ -65,27 +63,11 @@ export default {
                     { required: true, message: '请输入缩放比例', trigger: 'blur' }
                 ]
             };
-            if (this.type === 'ADD') {
-                return Object.assign(crules, {
-                    code: [
-                        { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' }
-                    ]
-                });
-            } else {
-                return crules;
-            }
-        },
-        title() {
-            if (this.type === 'ADD') {
-                return this.$t('system.createDirectory');
-            } else {
-                return this.$t('system.editDictionary');
-            }
+            return crules;
         }
     },
     methods: {
         show(row) {
-            this.dialogVisible = true;
             if (row && row.id) {
                 this.formModel = {
                     id: row.id,
@@ -94,12 +76,18 @@ export default {
                     origin: row.origin,
                     scaling: row.scaling
                 };
+                this.isAdd = false;
+                this.title = this.$t('system.editDictionary');
+            } else {
+                this.isAdd = true;
+                this.title = this.$t('system.createDirectory');
             }
+            this.dialogVisible = true;
         },
         doSave() {
             const self = this;
             this.$refs.dataform.validateForm(() => {
-                if (self.type === 'ADD') {
+                if (this.isAdd === 'ADD') {
                     self.create();
                 } else {
                     self.update();
diff --git a/src/views/system/configLine/editConfig.vue b/src/views/system/configLine/editConfig.vue
deleted file mode 100644
index 755a2ba95..000000000
--- a/src/views/system/configLine/editConfig.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-<template>
-  <el-dialog v-dialogDrag :title="title" :visible.sync="dialogVisible" width="30%" :before-close="handleClose" center :close-on-click-modal="false" :z-index="3000">
-    <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
-    <span slot="footer" class="dialog-footer">
-      <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-    name: 'DictionaryEdit',
-    props: {
-        type: {
-            type: String,
-            required: true
-        }
-    },
-    data() {
-        return {
-            dialogVisible: false,
-            formModel: {
-                configKey: '',
-                configValue: '',
-                boolean: false
-                // description: ''
-            }
-        };
-    },
-    computed: {
-        form() {
-            const form = {
-                labelWidth: '100px',
-                items: [
-                    { prop: 'configKey', label: 'key:', type: 'text' }
-                    // { prop: 'description', label: '描述:', type: 'text' }
-                ]
-            };
-            return form;
-        },
-        rules() {
-            const rules = {
-                configKey: [
-                    { required: true, message: '请输入key值', trigger: 'blur' }
-                ],
-                configValue: [
-                    { required: true, message: '请输入value值', trigger: 'blur' }
-                ]
-                // remarks: [
-                //     { required: true, message: '请输入描述', trigger: 'blur' }
-                // ]
-            };
-            return rules;
-        },
-        title() {
-            if (this.type === 'ADD') {
-                return '添加配置项';
-            } else {
-                return '修改配置项';
-            }
-        }
-    },
-    methods: {
-        show(row) {
-            this.dialogVisible = true;
-            if (row && row.configKey) {
-                this.formModel = {
-                    configKey: row.configKey,
-                    configValue: JSON.parse(row.configValue),
-                    boolean: row.boolean
-                    // description: row.description
-                };
-            }
-        },
-        doSave() {
-            const self = this;
-            this.$refs.dataform.validateForm(() => {
-                if (self.type === 'ADD') {
-                    self.create();
-                } else {
-                    self.update();
-                }
-            });
-        },
-        buildModel(data) {
-            return {
-                configKey: data.configKey,
-                configValue: data.boolean ? JSON.stringify(data.configValue) : data.configValue,
-                boolean: data.boolean
-            };
-        },
-        create() {
-            this.$emit('create', this.buildModel(this.formModel));
-            this.handleClose();
-        },
-        update() {
-            this.$emit('update', this.buildModel(this.formModel));
-            this.handleClose();
-        },
-        handleClose(done) {
-            this.formModel = {
-                configKey: '',
-                configValue: ''
-                // description: ''
-            };
-            this.$refs.dataform.resetForm();
-            if (done) {
-                done();
-            } else {
-                this.dialogVisible = false;
-            }
-        }
-    }
-};
-</script>
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-</style>
diff --git a/src/views/system/configLine/index.vue b/src/views/system/configLine/index.vue
index 8d862a96f..8d84c632c 100644
--- a/src/views/system/configLine/index.vue
+++ b/src/views/system/configLine/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <edit ref="create" type="ADD" @reloadTable="reloadTable" />
-    <edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+    <edit ref="edit" @reloadTable="reloadTable" />
     <config ref="config" @reloadTable="reloadTable" />
   </div>
 </template>
@@ -106,7 +105,8 @@ export default {
         },
         // 新增指令
         handleAdd() {
-            this.$refs.create.show();
+            this.$refs.edit.show();
+            // this.$refs.create.show();
         },
         handleDelete(index, row) {
             this.$confirm(this.$t('system.wellDelType'), this.$t('global.tips'), {
diff --git a/src/views/system/dictionary/edit.vue b/src/views/system/dictionary/edit.vue
index 626209530..dfa3e85e8 100644
--- a/src/views/system/dictionary/edit.vue
+++ b/src/views/system/dictionary/edit.vue
@@ -3,22 +3,16 @@
     <data-form ref="dataform" :form="form" :form-model="formModel" :rules="rules" />
     <span slot="footer" class="dialog-footer">
       <el-button type="primary" @click="doSave">{{ $t('global.confirm') }}</el-button>
-      <el-button @click="dialogVisible = false">{{ $t('global.cancel') }}</el-button>
+      <el-button @click="handleClose">{{ $t('global.cancel') }}</el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import { create, checkDicCodeExist, getData, update } from '@/api/management/dictionary';
+import { create, checkDicCodeExist, update } from '@/api/management/dictionary';
 import { validateCharCode } from '@/utils/validate';
 export default {
     name: 'DictionaryEdit',
-    props: {
-        type: {
-            type: String,
-            required: true
-        }
-    },
     data() {
         return {
             dialogVisible: false,
@@ -27,16 +21,17 @@ export default {
                 name: '',
                 status: '1',
                 remarks: ''
-            }
+            },
+            title:'',
+            isAdd:false
         };
     },
     computed: {
         form() {
-            const isAdd = this.type === 'ADD';
             const form = {
                 labelWidth: '60px',
                 items: [
-                    { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !isAdd },
+                    { prop: 'code', label: this.$t('system.code'), type: 'text', required: true, disabled: !this.isAdd },
                     { prop: 'name', label: this.$t('system.name'), type: 'text', required: true },
                     {
                         prop: 'status', label: this.$t('system.status'), type: 'select', required: true, options: this.$ConstSelect.Status
@@ -58,8 +53,9 @@ export default {
                 remarks: [
                     { max: 50, message: this.$t('rules.strLengthNotExceed50'), trigger: 'blur' }
                 ]
+
             };
-            if (this.type === 'ADD') {
+            if (this.isAdd) {
                 return Object.assign(crules, {
                     code: [
                         { required: true, message: this.$t('rules.pleaseInputCode'), trigger: 'blur' },
@@ -70,13 +66,6 @@ export default {
             } else {
                 return crules;
             }
-        },
-        title() {
-            if (this.type === 'ADD') {
-                return this.$t('system.createDirectory');
-            } else {
-                return this.$t('system.editDictionary');
-            }
         }
     },
     methods: {
@@ -95,19 +84,30 @@ export default {
                 });
             }
         },
-        show(id) {
-            this.dialogVisible = true;
-            if (id) {
-                getData(id).then(response => {
-                    this.formModel = response.data;
-                    this.$refs.dataform.resetForm();
-                });
+        doShow(row) {
+            if (row) {
+                this.title = this.$t('system.editDictionary');
+                this.isAdd = false;
+                this.formModel = row;
+            } else {
+                this.title = this.$t('system.createDirectory');
+                this.isAdd = true;
+                this.formModel = {
+                    code: '',
+                    name: '',
+                    status: '1',
+                    remarks: ''
+                };
             }
+            this.dialogVisible = true;
+            this.$nextTick(()=>{
+                this.$refs.dataform.clearValidate();
+            });
         },
         doSave() {
             const self = this;
             this.$refs.dataform.validateForm(() => {
-                if (self.type === 'ADD') {
+                if (self.isAdd) {
                     self.create();
                 } else {
                     self.update();
@@ -134,19 +134,8 @@ export default {
                 self.$message.error(`${this.$t('error.updateDictionaryFailed')}:${error.message}`);
             });
         },
-        handleClose(done) {
-            this.formModel = {
-                code: '',
-                name: '',
-                status: '1',
-                remarks: ''
-            };
-            this.$refs.dataform.resetForm();
-            if (done) {
-                done();
-            } else {
-                this.dialogVisible = false;
-            }
+        handleClose() {
+            this.dialogVisible = false;
         }
     }
 };
diff --git a/src/views/system/dictionary/index.vue b/src/views/system/dictionary/index.vue
index aa490be04..6c5855d64 100644
--- a/src/views/system/dictionary/index.vue
+++ b/src/views/system/dictionary/index.vue
@@ -1,8 +1,7 @@
 <template>
   <div>
     <QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <dictionary-edit ref="create" type="ADD" @reloadTable="reloadTable" />
-    <dictionary-edit ref="edit" type="EDIT" @reloadTable="reloadTable" />
+    <dictionary-edit ref="edit" @reloadTable="reloadTable" />
   </div>
 </template>
 
@@ -104,11 +103,11 @@ export default {
         },
 
         handleEdit(index, row) {
-            this.$refs.edit.show(row.id);
+            this.$refs.edit.doShow(row);
         },
 
         handleAdd() {
-            this.$refs.create.show();
+            this.$refs.edit.doShow();
         },
 
         handleBatchDelete() {
diff --git a/src/views/system/systemGenerate/create.vue b/src/views/system/systemGenerate/create.vue
index d469e0b3e..8eda049f8 100644
--- a/src/views/system/systemGenerate/create.vue
+++ b/src/views/system/systemGenerate/create.vue
@@ -11,13 +11,12 @@
 </template>
 <script>
 import ConstConfig from '@/scripts/ConstConfig';
+import {createMapSubSystem, updateSubSystem, generateMapSystem} from '@/api/trainingPlatform';
 import { ProjectList} from '@/scripts/ProjectConfig';
 import Cookies from 'js-cookie';
 export default {
     name: 'CreateSubSystem',
     props: {
-        title: { type:String, required:true },
-        operateType:{ type:String, required:true },
         mapList:{
             required:true,
             type:Array
@@ -29,6 +28,9 @@ export default {
             disabled:null,
             productList:[],
             typeList:[],
+            title:'',
+            isAdd:true,
+            isGernerate:false,
             formModel:{
                 customized:'',
                 mapId:'',
@@ -48,7 +50,8 @@ export default {
         },
         form() {
             let form = {};
-            if (this.operateType == 'add') {
+            if (this.isAdd) {
+                // 新增
                 form = {
                     labelWidth: '150px',
                     items: [
@@ -59,7 +62,16 @@ export default {
                         { prop: 'type', label: this.$t('systemGenerate.type'), type: 'select', required: true, options: this.typeList}
                     ]
                 };
+            } else if (this.isGernerate) {
+                // 一键生成
+                form = {
+                    labelWidth: '150px',
+                    items: [
+                        { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true, options: this.mapList}
+                    ]
+                };
             } else {
+                // 修改
                 form = {
                     labelWidth: '150px',
                     items: [
@@ -71,32 +83,23 @@ export default {
         },
         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'}
-                ],
-                prdType:[
-                    { required: true, message: this.$t('rules.productTypeInput'), trigger: 'change'}
-                ]
-                };
-            } else {
-                crules = {
-                    name: [
-                        { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'blur' },
-                        { required: true, message: this.$t('systemGenerate.inputName'), trigger: 'change' }
-                    ]
-                };
-            }
+            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'}
+            ],
+            prdType:[
+                { required: true, message: this.$t('rules.productTypeInput'), trigger: 'change'}
+            ]
+            };
             return crules;
         }
     },
@@ -110,22 +113,63 @@ export default {
                 ? customeredProductType.map(elem => { return { value: elem.value, label: elem.enlabel }; })
                 : customeredProductType.map(elem => { return { value: elem.value, label: elem.label }; });
         },
-        doShow(data) {
-            if (data) {
-                this.formModel.name = data.name;
-                this.formModel.id = data.id;
+        doShow({type, row}) {
+            if (row) {
+                this.title = this.$t('systemGenerate.modifySubSystem');
+                this.isAdd = false;
+                this.isGernerate = false;
+                this.formModel.name = row.name;
+                this.formModel.id = row.id;
+            } else {
+                if (type == 'add') {
+                    this.title = this.$t('systemGenerate.createSubSystem');
+                    this.isAdd = true;
+                    this.isGernerate = false;
+                    this.formModel.mapId = '';
+                    this.formModel.name = '';
+                } else {
+                    this.title = this.$t('systemGenerate.generation');
+                    this.isAdd = false;
+                    this.isGernerate = true;
+                    this.formModel.mapId = '';
+                }
             }
             this.dialogVisible = true;
+            this.$nextTick(()=>{
+                this.$refs.dataform.clearValidate();
+            });
         },
         doCreate() {
             const self = this;
             this.$refs.dataform.validateForm(() => {
-                self.$emit('create', Object.assign({}, this.formModel));
+                if (this.isAdd) {
+                    delete this.formModel.id;
+                    createMapSubSystem(this.formModel).then(response => {
+                        this.$message.success(this.$t('systemGenerate.createMapSystemSuccess'));
+                        self.$emit('reloadTable');
+                    }).catch(() => {
+                        this.$messageBox(this.$t('systemGenerate.createMapSystemFail'));
+                    });
+                } else if (this.isGernerate) {
+                    generateMapSystem(this.formModel.mapId).then(response => {
+                        this.$message.success(this.$t('systemGenerate.generateSuccess'));
+                        self.$emit('reloadTable');
+                    }).catch(() => {
+                        this.$messageBox(this.$t('systemGenerate.generateFail'));
+                    });
+                } else {
+                    const datainfo = {'name': this.formModel.name};
+                    updateSubSystem(this.formModel.id, datainfo).then(response => {
+                        this.$message.success(this.$t('systemGenerate.updateMapSystemSuccess'));
+                        self.$emit('reloadTable');
+                    }).catch(() => {
+                        this.$messageBox(this.$t('systemGenerate.updateMapSystemFail'));
+                    });
+                }
                 self.doClose();
             });
         },
         doClose() {
-            this.$refs.dataform.resetForm();
             this.dialogVisible = false;
         }
     }
diff --git a/src/views/system/systemGenerate/generate.vue b/src/views/system/systemGenerate/generate.vue
deleted file mode 100644
index edc4810ba..000000000
--- a/src/views/system/systemGenerate/generate.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <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>
-export default {
-    name: 'OnceGenerate',
-    props:{
-        mapList:{
-            required:true,
-            type:Array
-        }
-    },
-    data() {
-        return {
-            dialogVisible: false,
-            formModel:{
-                mapId:''
-            },
-            title: this.$t('systemGenerate.generation')
-        };
-    },
-    computed: {
-        form() {
-            const form = {
-                labelWidth: '150px',
-                items: [
-                    { prop: 'mapId', label: this.$t('systemGenerate.mapName'), type: 'select', required: true, options: this.mapList}
-                ]
-            };
-            return form;
-        },
-        rules() {
-            const crules = {
-                mapId:[
-                    { required: true, message: this.$t('systemGenerate.selectMap'), trigger: 'change'}
-                ]
-            };
-            return crules;
-        }
-    },
-    methods: {
-        doShow() {
-            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{
-    padding: 25px 55px 20px 30px;
-}
-</style>
diff --git a/src/views/system/systemGenerate/index.vue b/src/views/system/systemGenerate/index.vue
index c527ef1d5..faeff046d 100644
--- a/src/views/system/systemGenerate/index.vue
+++ b/src/views/system/systemGenerate/index.vue
@@ -1,25 +1,21 @@
 <template>
   <el-card>
     <QueryListPage ref="subSystemListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
-    <once-generate ref="generate" :map-list="mapList" @create="generateMapSystem" />
-    <createMapSystem ref="createMapSystem" :map-list="mapList" :title="$t('systemGenerate.createSubSystem')" operate-type="add" @create="handleCreate" />
-    <createMapSystem ref="modifyMapSystem" :map-list="mapList" :title="$t('systemGenerate.modifySubSystem')" operate-type="modify" @create="handleModify" />
+    <mapSystemOperate ref="mapSystemOperate" :map-list="mapList" @reloadTable="reloadTable" />
   </el-card>
 </template>
 
 <script>
 import Cookies from 'js-cookie';
 import { getPublishMapListOnline } from '@/api/jmap/map';
-import { generateMapSystem, getMapSystemPageList, createMapSubSystem, getSubSystemInfo, updateSubSystem, deleteSubSystem} from '@/api/trainingPlatform';
+import { getMapSystemPageList, deleteSubSystem} from '@/api/trainingPlatform';
 import ConstConfig from '@/scripts/ConstConfig';
-import OnceGenerate from './generate';
-import createMapSystem from './create';
+import mapSystemOperate from './create';
 
 export default {
     name: 'SystemGenerate',
     components: {
-        OnceGenerate,
-        createMapSystem
+        mapSystemOperate
     },
     data() {
         return {
@@ -121,11 +117,7 @@ export default {
     },
     methods: {
         updateData(index, row) {
-            getSubSystemInfo(row.id).then(response => {
-                this.$refs.modifyMapSystem.doShow(response.data);
-            }).catch(() => {
-                this.$messageBox(this.$t('systemGenerate.getSubSystemInfoFail'));
-            });
+            this.$refs.mapSystemOperate.doShow({type:'update', row:row});
         },
         deleteData(index, row) {
             this.$confirm(this.$t('systemGenerate.deleteMapSystemTip'), this.$t('global.tips'), {
@@ -141,26 +133,8 @@ export default {
                 });
             }).catch(() => { });
         },
-        handleCreate(data) {
-            delete data.id;
-            createMapSubSystem(data).then(response => {
-                this.$message.success(this.$t('systemGenerate.createMapSystemSuccess'));
-                this.reloadTable();
-            }).catch(() => {
-                this.$messageBox(this.$t('systemGenerate.createMapSystemFail'));
-            });
-        },
-        handleModify(data) {
-            const datainfo = {'name': data.name};
-            updateSubSystem(data.id, datainfo).then(response => {
-                this.$message.success(this.$t('systemGenerate.updateMapSystemSuccess'));
-                this.reloadTable();
-            }).catch(() => {
-                this.$messageBox(this.$t('systemGenerate.updateMapSystemFail'));
-            });
-        },
         handleAdd() {
-            this.$refs.createMapSystem.doShow();
+            this.$refs.mapSystemOperate.doShow({type:'add'});
         },
         reloadTable() {
             if (this.queryList && this.queryList.reload) {
@@ -194,15 +168,7 @@ export default {
             }
         },
         generate() {
-            this.$refs.generate.doShow();
-        },
-        generateMapSystem(data) {
-            generateMapSystem(data.mapId).then(response => {
-                this.reloadTable();
-                this.$message.success(this.$t('systemGenerate.generateSuccess'));
-            }).catch(() => {
-                this.$messageBox(this.$t('systemGenerate.generateFail'));
-            });
+            this.$refs.mapSystemOperate.doShow({type:'generate'});
         },
         queryFunction(params) {
             return getMapSystemPageList(params);
diff --git a/src/views/teach/detail/index.vue b/src/views/teach/detail/index.vue
index f63dad156..d2fa550e5 100644
--- a/src/views/teach/detail/index.vue
+++ b/src/views/teach/detail/index.vue
@@ -178,7 +178,7 @@ export default {
         },
         filterNode(value, data) {
             if (!value) return true;
-            return data.name.indexOf(value) !== -1;
+            return data.name.includes(value);
         },
         buy() {
             // this.disabled = true;
diff --git a/src/views/trainingPlatform/demonList.vue b/src/views/trainingPlatform/demonList.vue
index 52d541fa0..15dfdc549 100644
--- a/src/views/trainingPlatform/demonList.vue
+++ b/src/views/trainingPlatform/demonList.vue
@@ -95,7 +95,7 @@ export default {
     methods: {
         filterNode(value, data) {
             if (!value) return true;
-            return data.name.indexOf(value) !== -1;
+            return data.name.includes(value);
         },
         showContextMenu(e, obj, node, vueElem) {
             if (obj) {
@@ -224,7 +224,6 @@ export default {
                     data = item;
                 }
                 if (checkId === item.key) {
-                    console.log(item, {data: data});
                     this.clickEvent(item, {data: data}, null, true);
                 } else {
                     this.findTree(item.children, checkId, data);
diff --git a/static/trafficplan/man1.FBX b/static/trafficplan/man1.FBX
new file mode 100644
index 000000000..f3025720c
Binary files /dev/null and b/static/trafficplan/man1.FBX differ
diff --git a/static/trafficplan/man2.FBX b/static/trafficplan/man2.FBX
new file mode 100644
index 000000000..eb7542588
Binary files /dev/null and b/static/trafficplan/man2.FBX differ
diff --git a/static/trafficplan/station.FBX b/static/trafficplan/station.FBX
new file mode 100644
index 000000000..dc24ea25c
Binary files /dev/null and b/static/trafficplan/station.FBX differ
diff --git a/static/trafficplan/train.FBX b/static/trafficplan/train.FBX
new file mode 100644
index 000000000..88818e311
Binary files /dev/null and b/static/trafficplan/train.FBX differ
diff --git a/static/trafficplan/trunkback.png b/static/trafficplan/trunkback.png
new file mode 100644
index 000000000..a1e3e3591
Binary files /dev/null and b/static/trafficplan/trunkback.png differ
diff --git a/static/trafficplan/trunkbody.png b/static/trafficplan/trunkbody.png
new file mode 100644
index 000000000..5a4b3ec3b
Binary files /dev/null and b/static/trafficplan/trunkbody.png differ
diff --git a/static/trafficplan/trunkhead.png b/static/trafficplan/trunkhead.png
new file mode 100644
index 000000000..71d9e8813
Binary files /dev/null and b/static/trafficplan/trunkhead.png differ
diff --git a/static/workertest/trafficplan/trafficstation.js b/static/workertest/trafficplan/trafficstation.js
new file mode 100644
index 000000000..c8c3670e6
--- /dev/null
+++ b/static/workertest/trafficplan/trafficstation.js
@@ -0,0 +1,41 @@
+var i=0;
+var update = null;
+function timedCount(){
+
+  onmessage = (e) => {
+
+
+    if(e.data[0] == "on"){
+      // console.log("on");
+      update = "1";
+    }
+
+    if(e.data[0] == "off"){
+      clearInterval(update);
+    }
+    // console.log(e.data);
+    if(e.data[0] == "changespeed"){
+      if(update){
+        console.log(e.data[1]);
+        clearInterval(update);
+        if(e.data[1] == 0){
+
+        }else{
+          let speed = 900/e.data[1];
+          console.log(speed);
+          update = setInterval("stationupdate()", speed);
+        }
+
+      }
+
+    }
+}
+
+
+}
+function stationupdate(){
+
+  postMessage("up");
+}
+
+timedCount();